Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

vfs,proc: guarantee unique inodes in /proc

Dave Jones found another /proc issue with his Trinity tool: thanks to
the namespace model, we can have multiple /proc dentries that point to
the same inode, aliasing directories in /proc/<pid>/net/ for example.

This ends up being a total disaster, because it acts like hardlinked
directories, and causes locking problems. We rely on the topological
sort of the inodes pointed to by dentries, and if we have aliased
directories, that odering becomes unreliable.

In short: don't do this. Multiple dentries with the same (directory)
inode is just a bad idea, and the namespace code should never have
exposed things this way. But we're kind of stuck with it.

This solves things by just always allocating a new inode during /proc
dentry lookup, instead of using "iget_locked()" to look up existing
inodes by superblock and number. That actually simplies the code a bit,
at the cost of potentially doing more inode [de]allocations.

That said, the inode lookup wasn't free either (and did a lot of locking
of inodes), so it is probably not that noticeable. We could easily keep
the old lookup model for non-directory entries, but rather than try to
be excessively clever this just implements the minimal and simplest
workaround for the problem.

Reported-and-tested-by: Dave Jones <davej@redhat.com>
Analyzed-by: Al Viro <viro@zeniv.linux.org.uk>
Cc: stable@vger.kernel.org
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

+3 -3
+3 -3
fs/proc/inode.c
··· 446 446 447 447 struct inode *proc_get_inode(struct super_block *sb, struct proc_dir_entry *de) 448 448 { 449 - struct inode *inode = iget_locked(sb, de->low_ino); 449 + struct inode *inode = new_inode_pseudo(sb); 450 450 451 - if (inode && (inode->i_state & I_NEW)) { 451 + if (inode) { 452 + inode->i_ino = de->low_ino; 452 453 inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME; 453 454 PROC_I(inode)->pde = de; 454 455 ··· 477 476 inode->i_fop = de->proc_fops; 478 477 } 479 478 } 480 - unlock_new_inode(inode); 481 479 } else 482 480 pde_put(de); 483 481 return inode;