summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorIan Kent <raven@themaw.net>2016-10-11 13:52:33 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2016-10-11 15:06:31 -0700
commit1973a122697168c0585ffce9d4bd46745ddaa6f6 (patch)
treef8f8e135b9aad05ac4ac6d2f48c69a0d0f828545 /fs
parent749800ef537848b9569da9bb1463f1de4b96c0a4 (diff)
downloadop-kernel-dev-1973a122697168c0585ffce9d4bd46745ddaa6f6.zip
op-kernel-dev-1973a122697168c0585ffce9d4bd46745ddaa6f6.tar.gz
autofs: fix autofs4_fill_super() error exit handling
Somewhere along the line the error handling gotos have become incorrect. Link: http://lkml.kernel.org/r/20160812024749.12352.15100.stgit@pluto.themaw.net Signed-off-by: Ian Kent <raven@themaw.net> Cc: Tomohiro Kusumi <kusumi.tomohiro@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/autofs4/inode.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/autofs4/inode.c b/fs/autofs4/inode.c
index d76573f..3f486c1 100644
--- a/fs/autofs4/inode.c
+++ b/fs/autofs4/inode.c
@@ -313,7 +313,7 @@ int autofs4_fill_super(struct super_block *s, void *data, int silent)
if (!pipe) {
pr_err("could not open pipe file descriptor\n");
- goto fail_dput;
+ goto fail_put_pid;
}
ret = autofs_prepare_pipe(pipe);
if (ret < 0)
@@ -334,14 +334,14 @@ int autofs4_fill_super(struct super_block *s, void *data, int silent)
fail_fput:
pr_err("pipe file descriptor does not contain proper ops\n");
fput(pipe);
- /* fall through */
+fail_put_pid:
+ put_pid(sbi->oz_pgrp);
fail_dput:
dput(root);
goto fail_free;
fail_ino:
kfree(ino);
fail_free:
- put_pid(sbi->oz_pgrp);
kfree(sbi);
s->s_fs_info = NULL;
return ret;
OpenPOWER on IntegriCloud