redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

autofs: fix the return value of autofs4_fill_super

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

And it should return the err value from autofs_prepare_pipe.

Signed-off-by: Rui Xiang <rui.xiang@huawei.com>
Signed-off-by: Ian Kent <raven@themaw.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Rui Xiang 2014-01-23 15:54:59 -08:00 committed by Linus Torvalds
parent fbff08706d
commit da29b75439
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
fs/autofs4/inode.c
View file

@ -212,10 +212,11 @@ int autofs4_fill_super(struct super_block *s, void *data, int silent)
struct autofs_info *ino; struct autofs_info *ino;
int pgrp; int pgrp;
bool pgrp_set = false; bool pgrp_set = false;
int ret = -EINVAL;
sbi = kzalloc(sizeof(*sbi), GFP_KERNEL); sbi = kzalloc(sizeof(*sbi), GFP_KERNEL);
if (!sbi) if (!sbi)
goto fail_unlock; return -ENOMEM;
DPRINTK("starting up, sbi = %p",sbi); DPRINTK("starting up, sbi = %p",sbi);
s->s_fs_info = 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. * Get the root inode and dentry, but defer checking for errors.
*/ */
ino = autofs4_new_ino(sbi); ino = autofs4_new_ino(sbi);
if (!ino) if (!ino) {
ret = -ENOMEM;
goto fail_free; goto fail_free;
}
root_inode = autofs4_get_inode(s, S_IFDIR | 0755); root_inode = autofs4_get_inode(s, S_IFDIR | 0755);
root = d_make_root(root_inode); root = d_make_root(root_inode);
if (!root) 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"); printk("autofs: could not open pipe file descriptor\n");
goto fail_dput; goto fail_dput;
} }
if (autofs_prepare_pipe(pipe) < 0) ret = autofs_prepare_pipe(pipe);
if (ret < 0)
goto fail_fput; goto fail_fput;
sbi->pipe = pipe; sbi->pipe = pipe;
sbi->pipefd = pipefd; sbi->pipefd = pipefd;
@ -336,8 +340,7 @@ fail_free:
put_pid(sbi->oz_pgrp); put_pid(sbi->oz_pgrp);
kfree(sbi); kfree(sbi);
s->s_fs_info = NULL; s->s_fs_info = NULL;
fail_unlock: return ret;
return -EINVAL;
} }
struct inode *autofs4_get_inode(struct super_block *sb, umode_t mode) struct inode *autofs4_get_inode(struct super_block *sb, umode_t mode)