Skip to content

Commit 9c4557e

Browse files
committed
apparmor: fix lockdep warning when removing a namespace
Fix the following lockdep warning [ 1119.158984] ============================================ [ 1119.158988] WARNING: possible recursive locking detected [ 1119.158996] 6.0.0-rc1+ raspberrypi#257 Tainted: G E N [ 1119.158999] -------------------------------------------- [ 1119.159001] bash/80100 is trying to acquire lock: [ 1119.159007] ffff88803e79b4a0 (&ns->lock/1){+.+.}-{4:4}, at: destroy_ns.part.0+0x43/0x140 [ 1119.159028] but task is already holding lock: [ 1119.159030] ffff8881009764a0 (&ns->lock/1){+.+.}-{4:4}, at: aa_remove_profiles+0x3f0/0x640 [ 1119.159040] other info that might help us debug this: [ 1119.159042] Possible unsafe locking scenario: [ 1119.159043] CPU0 [ 1119.159045] ---- [ 1119.159047] lock(&ns->lock/1); [ 1119.159051] lock(&ns->lock/1); [ 1119.159055] *** DEADLOCK *** Which is caused by an incorrect lockdep nesting notation Fixes: feb3c76 ("apparmor: fix possible recursive lock warning in __aa_create_ns") Signed-off-by: John Johansen <[email protected]>
1 parent c73275c commit 9c4557e

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

security/apparmor/policy.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1170,7 +1170,7 @@ ssize_t aa_remove_profiles(struct aa_ns *policy_ns, struct aa_label *subj,
11701170

11711171
if (!name) {
11721172
/* remove namespace - can only happen if fqname[0] == ':' */
1173-
mutex_lock_nested(&ns->parent->lock, ns->level);
1173+
mutex_lock_nested(&ns->parent->lock, ns->parent->level);
11741174
__aa_bump_ns_revision(ns);
11751175
__aa_remove_ns(ns);
11761176
mutex_unlock(&ns->parent->lock);

0 commit comments

Comments
 (0)