MIRRORS/linux-yocto
1
0
Fork 0
mirror of git://git.yoctoproject.org/linux-yocto.git synced 2025-07-18 19:49:40 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

apparmor: don't try to replace stale label in ptrace access check

Browse Source 
[ Upstream commit 1f8266ff58 ]

As a comment above begin_current_label_crit_section() explains,
begin_current_label_crit_section() must run in sleepable context because
when label_is_stale() is true, aa_replace_current_label() runs, which uses
prepare_creds(), which can sleep.
Until now, the ptrace access check (which runs with a task lock held)
violated this rule.

Also add a might_sleep() assertion to begin_current_label_crit_section(),
because asserts are less likely to be ignored than comments.

Fixes: b2d09ae449 ("apparmor: move ptrace checks to using labels")
Signed-off-by: Jann Horn <jannh@google.com>
Signed-off-by: John Johansen <john.johansen@canonical.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Jann Horn 2018-09-13 18:12:09 +02:00 committed by Greg Kroah-Hartman
parent 961e9f394d
commit 49f3e22df7
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
security/apparmor/include/context.h
View File

@ -191,6 +191,8 @@ static inline struct aa_label *begin_current_label_crit_section(void)
{ {
struct aa_label *label = aa_current_raw_label(); struct aa_label *label = aa_current_raw_label();
might_sleep();
if (label_is_stale(label)) { if (label_is_stale(label)) {
label = aa_get_newest_label(label); label = aa_get_newest_label(label);
if (aa_replace_current_label(label) == 0) if (aa_replace_current_label(label) == 0)

4
security/apparmor/lsm.c
View File

@ -108,12 +108,12 @@ static int apparmor_ptrace_access_check(struct task_struct *child,
struct aa_label *tracer, *tracee; struct aa_label *tracer, *tracee;
int error; int error;
tracer = begin_current_label_crit_section(); tracer = __begin_current_label_crit_section();
tracee = aa_get_task_label(child); tracee = aa_get_task_label(child);
error = aa_may_ptrace(tracer, tracee, error = aa_may_ptrace(tracer, tracee,
mode == PTRACE_MODE_READ ? AA_PTRACE_READ : AA_PTRACE_TRACE); mode == PTRACE_MODE_READ ? AA_PTRACE_READ : AA_PTRACE_TRACE);
aa_put_label(tracee); aa_put_label(tracee);
end_current_label_crit_section(tracer); __end_current_label_crit_section(tracer);
return error; return error;
} }