summaryrefslogtreecommitdiffstats
path: root/fs
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 /fs
parentacd629446804617a8fe4700fc4ca16eb44aa4efd (diff)
parent6ade99ec6175ab2b54c227521e181e1c3c2bfc8a (diff)
downloadlinux-b2768df24ec400dd4f7fa79542f797e904812053.tar.bz2
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 'fs')
-rw-r--r--fs/proc/base.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/proc/base.c b/fs/proc/base.c
index 572898dd16a0..eb2255e95f62 100644
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -3286,7 +3286,6 @@ static const struct inode_operations proc_tgid_base_inode_operations = {
void proc_flush_pid(struct pid *pid)
{
proc_invalidate_siblings_dcache(&pid->inodes, &pid->lock);
- put_pid(pid);
}
static struct dentry *proc_pid_instantiate(struct dentry * dentry,