diff options
| author | Jann Horn <jannh@google.com> | 2018-09-29 03:49:26 +0200 |
|---|---|---|
| committer | John Johansen <john.johansen@canonical.com> | 2018-10-03 15:29:22 +0200 |
| commit | ca3fde5214e1d24f78269b337d3f22afd6bf445e (patch) | |
| tree | 74d474a553b59e9b0bcc1bf5627047f9bf3023f2 /security | |
| parent | apparmor: Replace spin_is_locked() with lockdep (diff) | |
| download | linux-ca3fde5214e1d24f78269b337d3f22afd6bf445e.tar.xz linux-ca3fde5214e1d24f78269b337d3f22afd6bf445e.zip | |
apparmor: don't try to replace stale label in ptraceme check
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: b2d09ae449ced ("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>
Diffstat (limited to 'security')
| -rw-r--r-- | security/apparmor/lsm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c index 2c842f24821b..d08aac05c65a 100644 --- a/security/apparmor/lsm.c +++ b/security/apparmor/lsm.c @@ -132,11 +132,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; } |