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

Commit da29b754 authored by Rui Xiang's avatar Rui Xiang Committed by Linus Torvalds
Browse files

autofs: fix the return value of autofs4_fill_super 



While kzallocing sbi/ino fails, it should return -ENOMEM.

And it should return the err value from autofs_prepare_pipe.

Signed-off-by: default avatarRui Xiang <rui.xiang@huawei.com>
Signed-off-by: default avatarIan Kent <raven@themaw.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent fbff0870

fs/autofs4/inode.c

+8 −5
Original line number Diff line number Diff line
@@ -212,10 +212,11 @@ int autofs4_fill_super(struct super_block *s, void *data, int silent) 
	struct autofs_info *ino;

	int pgrp;

	bool pgrp_set = false;

	int ret = -EINVAL;



	sbi = kzalloc(sizeof(*sbi), GFP_KERNEL);

	if (!sbi)

		goto fail_unlock;

		return -ENOMEM;

	DPRINTK("starting up, sbi = %p",sbi);



	s->s_fs_info = sbi;
@@ -249,8 +250,10 @@ int autofs4_fill_super(struct super_block *s, void *data, int silent) 
	 * Get the root inode and dentry, but defer checking for errors.

	 */

	ino = autofs4_new_ino(sbi);

	if (!ino)

	if (!ino) {

		ret = -ENOMEM;

		goto fail_free;

	}

	root_inode = autofs4_get_inode(s, S_IFDIR | 0755);

	root = d_make_root(root_inode);

	if (!root)
@@ -308,7 +311,8 @@ int autofs4_fill_super(struct super_block *s, void *data, int silent) 
		printk("autofs: could not open pipe file descriptor\n");

		goto fail_dput;

	}

	if (autofs_prepare_pipe(pipe) < 0)

	ret = autofs_prepare_pipe(pipe);

	if (ret < 0)

		goto fail_fput;

	sbi->pipe = pipe;

	sbi->pipefd = pipefd;
@@ -336,8 +340,7 @@ int autofs4_fill_super(struct super_block *s, void *data, int silent) 
	put_pid(sbi->oz_pgrp);

	kfree(sbi);

	s->s_fs_info = NULL;

fail_unlock:

	return -EINVAL;

	return ret;

}



struct inode *autofs4_get_inode(struct super_block *sb, umode_t mode)