Skip to content

Commit 7055197

Browse files
Alexey Dobriyanakpm00
authored andcommitted
proc: fix dentry/inode overinstantiating under /proc/${pid}/net
When a process exits, /proc/${pid}, and /proc/${pid}/net dentries are flushed. However some leaf dentries like /proc/${pid}/net/arp_cache aren't. That's because respective PDEs have proc_misc_d_revalidate() hook which returns 1 and leaves dentries/inodes in the LRU. Force revalidation/lookup on everything under /proc/${pid}/net by inheriting proc_net_dentry_ops. [[email protected]: coding-style cleanups] Link: https://lkml.kernel.org/r/[email protected] Fixes: c6c75de ("proc: fix lookup in /proc/net subdirectories after setns(2)") Signed-off-by: Alexey Dobriyan <[email protected]> Reported-by: hui li <[email protected]> Cc: Al Viro <[email protected]> Signed-off-by: Andrew Morton <[email protected]>
1 parent f6e2c20 commit 7055197

File tree

2 files changed

+6
-0
lines changed

2 files changed

+6
-0
lines changed

fs/proc/generic.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -448,6 +448,9 @@ static struct proc_dir_entry *__proc_create(struct proc_dir_entry **parent,
448448
proc_set_user(ent, (*parent)->uid, (*parent)->gid);
449449

450450
ent->proc_dops = &proc_misc_dentry_ops;
451+
/* Revalidate everything under /proc/${pid}/net */
452+
if ((*parent)->proc_dops == &proc_net_dentry_ops)
453+
pde_force_lookup(ent);
451454

452455
out:
453456
return ent;

fs/proc/proc_net.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -376,6 +376,9 @@ static __net_init int proc_net_ns_init(struct net *net)
376376

377377
proc_set_user(netd, uid, gid);
378378

379+
/* Seed dentry revalidation for /proc/${pid}/net */
380+
pde_force_lookup(netd);
381+
379382
err = -EEXIST;
380383
net_statd = proc_net_mkdir(net, "stat", netd);
381384
if (!net_statd)

0 commit comments

Comments
 (0)