Skip to content

Commit 44ebe01

Browse files
committed
Merge branch 'proc-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace
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
2 parents 9433a51 + ef1548a commit 44ebe01

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

fs/proc/inode.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -617,7 +617,7 @@ const struct inode_operations proc_link_inode_operations = {
617617

618618
struct inode *proc_get_inode(struct super_block *sb, struct proc_dir_entry *de)
619619
{
620-
struct inode *inode = new_inode_pseudo(sb);
620+
struct inode *inode = new_inode(sb);
621621

622622
if (inode) {
623623
inode->i_ino = de->low_ino;

fs/proc/self.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ int proc_setup_self(struct super_block *s)
4343
inode_lock(root_inode);
4444
self = d_alloc_name(s->s_root, "self");
4545
if (self) {
46-
struct inode *inode = new_inode_pseudo(s);
46+
struct inode *inode = new_inode(s);
4747
if (inode) {
4848
inode->i_ino = self_inum;
4949
inode->i_mtime = inode->i_atime = inode->i_ctime = current_time(inode);

fs/proc/thread_self.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ int proc_setup_thread_self(struct super_block *s)
4343
inode_lock(root_inode);
4444
thread_self = d_alloc_name(s->s_root, "thread-self");
4545
if (thread_self) {
46-
struct inode *inode = new_inode_pseudo(s);
46+
struct inode *inode = new_inode(s);
4747
if (inode) {
4848
inode->i_ino = thread_self_inum;
4949
inode->i_mtime = inode->i_atime = inode->i_ctime = current_time(inode);

0 commit comments

Comments
 (0)