summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2020-04-25 12:25:32 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2020-04-25 12:25:32 -0700
commitb2768df24ec400dd4f7fa79542f797e904812053 (patch)
tree9ba5b9e11fb7c3a5b36172c6a4481afd528d6267 /kernel
parentacd629446804617a8fe4700fc4ca16eb44aa4efd (diff)
parent6ade99ec6175ab2b54c227521e181e1c3c2bfc8a (diff)
downloadlinux-b2768df24ec400dd4f7fa79542f797e904812053.tar.gz
linux-b2768df24ec400dd4f7fa79542f797e904812053.tar.bz2
linux-b2768df24ec400dd4f7fa79542f797e904812053.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace
Pull pid leak fix from Eric Biederman: "Oleg noticed that put_pid(thread_pid) was not getting called when proc was not compiled in. Let's get that fixed before 5.7 is released and causes problems for anyone" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace: proc: Put thread_pid in release_task not proc_flush_pid
Diffstat (limited to 'kernel')
-rw-r--r--kernel/exit.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/exit.c b/kernel/exit.c
index 389a88cb3081..ce2a75bc0ade 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -219,6 +219,7 @@ repeat:
write_unlock_irq(&tasklist_lock);
proc_flush_pid(thread_pid);
+ put_pid(thread_pid);
release_thread(p);
put_task_struct_rcu_user(p);