Skip to content

Commit 51f0885

Browse files
committed
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 <[email protected]> Analyzed-by: Al Viro <[email protected]> Cc: [email protected] Signed-off-by: Linus Torvalds <[email protected]>
1 parent 9217cbb commit 51f0885

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

fs/proc/inode.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -446,9 +446,10 @@ static const struct file_operations proc_reg_file_ops_no_compat = {
446446

447447
struct inode *proc_get_inode(struct super_block *sb, struct proc_dir_entry *de)
448448
{
449-
struct inode *inode = iget_locked(sb, de->low_ino);
449+
struct inode *inode = new_inode_pseudo(sb);
450450

451-
if (inode && (inode->i_state & I_NEW)) {
451+
if (inode) {
452+
inode->i_ino = de->low_ino;
452453
inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
453454
PROC_I(inode)->pde = de;
454455

@@ -476,7 +477,6 @@ struct inode *proc_get_inode(struct super_block *sb, struct proc_dir_entry *de)
476477
inode->i_fop = de->proc_fops;
477478
}
478479
}
479-
unlock_new_inode(inode);
480480
} else
481481
pde_put(de);
482482
return inode;

0 commit comments

Comments
 (0)