Merge branch 'proc-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace

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

kernel os linux

Pull proc fix from Eric Biederman:
"Much to my surprise syzbot found a very old bug in proc that the
recent changes made easier to reproce. This bug is subtle enough it
looks like it fooled everyone who should know better"

* 'proc-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace:
proc: Use new_inode not new_inode_pseudo

Linus Torvalds 5 years ago 44ebe016 9433a51e

+3 -3

3 changed files

expand all

proc

inode.c

self.c

thread_self.c

+1 -1

fs/proc/inode.c

··· 617 617 618 618 struct inode *proc_get_inode(struct super_block *sb, struct proc_dir_entry *de) 619 619 { 620 - struct inode *inode = new_inode_pseudo(sb); 620 + struct inode *inode = new_inode(sb); 621 621 622 622 if (inode) { 623 623 inode->i_ino = de->low_ino;

+1 -1

fs/proc/self.c

··· 43 43 inode_lock(root_inode); 44 44 self = d_alloc_name(s->s_root, "self"); 45 45 if (self) { 46 - struct inode *inode = new_inode_pseudo(s); 46 + struct inode *inode = new_inode(s); 47 47 if (inode) { 48 48 inode->i_ino = self_inum; 49 49 inode->i_mtime = inode->i_atime = inode->i_ctime = current_time(inode);

+1 -1

fs/proc/thread_self.c

··· 43 43 inode_lock(root_inode); 44 44 thread_self = d_alloc_name(s->s_root, "thread-self"); 45 45 if (thread_self) { 46 - struct inode *inode = new_inode_pseudo(s); 46 + struct inode *inode = new_inode(s); 47 47 if (inode) { 48 48 inode->i_ino = thread_self_inum; 49 49 inode->i_mtime = inode->i_atime = inode->i_ctime = current_time(inode);