summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIan Kent2019-02-01 23:21:29 +0100
committerGreg Kroah-Hartman2019-03-13 22:02:32 +0100
commit929278903367a8a9ca7b701b4d0af9a6ba5110a3 (patch)
tree73f4c5d865ff2e903a41977b61c232ac5adda127
parentautofs: drop dentry reference only when it is never used (diff)
downloadkernel-qcow2-linux-929278903367a8a9ca7b701b4d0af9a6ba5110a3.tar.gz
kernel-qcow2-linux-929278903367a8a9ca7b701b4d0af9a6ba5110a3.tar.xz
kernel-qcow2-linux-929278903367a8a9ca7b701b4d0af9a6ba5110a3.zip
autofs: fix error return in autofs_fill_super()
[ Upstream commit f585b283e3f025754c45bbe7533fc6e5c4643700 ] In autofs_fill_super() on error of get inode/make root dentry the return should be ENOMEM as this is the only failure case of the called functions. Link: http://lkml.kernel.org/r/154725123240.11260.796773942606871359.stgit@pluto-themaw-net 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> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--fs/autofs/inode.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/autofs/inode.c b/fs/autofs/inode.c
index 846c052569dd..3c14a8e45ffb 100644
--- a/fs/autofs/inode.c
+++ b/fs/autofs/inode.c
@@ -255,8 +255,10 @@ int autofs_fill_super(struct super_block *s, void *data, int silent)
}
root_inode = autofs_get_inode(s, S_IFDIR | 0755);
root = d_make_root(root_inode);
- if (!root)
+ if (!root) {
+ ret = -ENOMEM;
goto fail_ino;
+ }
pipe = NULL;
root->d_fsdata = ino;