Skip to content

Commit d5bc5a9

Browse files
avaginebiederm
authored andcommitted
pid: fix lockdep deadlock warning due to ucount_lock
========================================================= [ INFO: possible irq lock inversion dependency detected ] 4.10.0-rc2-00024-g4aecec9-dirty torvalds#118 Tainted: G W --------------------------------------------------------- swapper/1/0 just changed the state of lock: (&(&sighand->siglock)->rlock){-.....}, at: [<ffffffffbd0a1bc6>] __lock_task_sighand+0xb6/0x2c0 but this lock took another, HARDIRQ-unsafe lock in the past: (ucounts_lock){+.+...} and interrupts could create inverse lock ordering between them. other info that might help us debug this: Chain exists of: &(&sighand->siglock)->rlock --> &(&tty->ctrl_lock)->rlock --> ucounts_lock Possible interrupt unsafe locking scenario: CPU0 CPU1 ---- ---- lock(ucounts_lock); local_irq_disable(); lock(&(&sighand->siglock)->rlock); lock(&(&tty->ctrl_lock)->rlock); <Interrupt> lock(&(&sighand->siglock)->rlock); *** DEADLOCK *** This patch removes a dependency between rlock and ucount_lock. Fixes: f333c70 ("pidns: Add a limit on the number of pid namespaces") Cc: stable@vger.kernel.org Signed-off-by: Andrei Vagin <avagin@openvz.org> Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
1 parent e7a72db commit d5bc5a9

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

kernel/pid_namespace.c

+6-4
Original file line numberDiff line numberDiff line change
@@ -151,8 +151,12 @@ static struct pid_namespace *create_pid_namespace(struct user_namespace *user_ns
151151

152152
static void delayed_free_pidns(struct rcu_head *p)
153153
{
154-
kmem_cache_free(pid_ns_cachep,
155-
container_of(p, struct pid_namespace, rcu));
154+
struct pid_namespace *ns = container_of(p, struct pid_namespace, rcu);
155+
156+
dec_pid_namespaces(ns->ucounts);
157+
put_user_ns(ns->user_ns);
158+
159+
kmem_cache_free(pid_ns_cachep, ns);
156160
}
157161

158162
static void destroy_pid_namespace(struct pid_namespace *ns)
@@ -162,8 +166,6 @@ static void destroy_pid_namespace(struct pid_namespace *ns)
162166
ns_free_inum(&ns->ns);
163167
for (i = 0; i < PIDMAP_ENTRIES; i++)
164168
kfree(ns->pidmap[i].page);
165-
dec_pid_namespaces(ns->ucounts);
166-
put_user_ns(ns->user_ns);
167169
call_rcu(&ns->rcu, delayed_free_pidns);
168170
}
169171

0 commit comments

Comments
 (0)