Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 87e0aab3 authored by Maxim Patlasov's avatar Maxim Patlasov Committed by Al Viro
Browse files

proc: avoid extra pde_put() in proc_fill_super() 



If proc_get_inode() succeeded, but d_make_root() failed, pde_put() for
proc_root will be called twice: the first time due to iput() called from
d_make_root() and the second time directly in the end of
proc_fill_super().

Signed-off-by: default avatarMaxim Patlasov <mpatlasov@parallels.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 41735818

fs/proc/inode.c

+15 −6
Original line number Original line Diff line number Diff line
@@ -486,6 +486,8 @@ struct inode *proc_get_inode(struct super_block *sb, struct proc_dir_entry *de) 




int proc_fill_super(struct super_block *s)

int proc_fill_super(struct super_block *s)

{

{

	struct inode *root_inode;



	s->s_flags |= MS_NODIRATIME | MS_NOSUID | MS_NOEXEC;

	s->s_flags |= MS_NODIRATIME | MS_NOSUID | MS_NOEXEC;

	s->s_blocksize = 1024;

	s->s_blocksize = 1024;

	s->s_blocksize_bits = 10;

	s->s_blocksize_bits = 10;
@@ -494,11 +496,18 @@ int proc_fill_super(struct super_block *s) 
	s->s_time_gran = 1;

	s->s_time_gran = 1;

	

	

	pde_get(&proc_root);

	pde_get(&proc_root);

	s->s_root = d_make_root(proc_get_inode(s, &proc_root));

	root_inode = proc_get_inode(s, &proc_root);

	if (s->s_root)

	if (!root_inode) {

		return 0;

		printk(KERN_ERR "proc_fill_super: get root inode failed\n");



	printk("proc_read_super: get root inode failed\n");

		pde_put(&proc_root);

		pde_put(&proc_root);

		return -ENOMEM;

		return -ENOMEM;

	}

	}



	s->s_root = d_make_root(root_inode);

	if (!s->s_root) {

		printk(KERN_ERR "proc_fill_super: allocate dentry failed\n");

		return -ENOMEM;

	}



	return 0;

}