mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-05 00:20:32 +00:00
apparmor: don't try to replace stale label in ptraceme check
[ Upstream commitca3fde5214
] 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 ptraceme access check (which runs with tasklist_lock held) violated this rule. Fixes:b2d09ae449
("apparmor: move ptrace checks to using labels") Reported-by: Cyrill Gorcunov <gorcunov@gmail.com> Reported-by: kernel test robot <rong.a.chen@intel.com> 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:
parent
0255fb2f1a
commit
3f9a54ce49
1 changed files with 2 additions and 2 deletions
|
@ -130,11 +130,11 @@ static int apparmor_ptrace_traceme(struct task_struct *parent)
|
|||
struct aa_label *tracer, *tracee;
|
||||
int error;
|
||||
|
||||
tracee = begin_current_label_crit_section();
|
||||
tracee = __begin_current_label_crit_section();
|
||||
tracer = aa_get_task_label(parent);
|
||||
error = aa_may_ptrace(tracer, tracee, AA_PTRACE_TRACE);
|
||||
aa_put_label(tracer);
|
||||
end_current_label_crit_section(tracee);
|
||||
__end_current_label_crit_section(tracee);
|
||||
|
||||
return error;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue