Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1460910

[PATCH 04/18] autofs - fix autofs4_fill_super() error exit handling

Show all headers | View raw

Somewhere along the line the error handling gotos have become incorrect.

Signed-off-by: Ian Kent <raven@themaw.net>
Cc: Tomohiro Kusumi <kusumi.tomohiro@gmail.com>
---
 fs/autofs4/inode.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/fs/autofs4/inode.c b/fs/autofs4/inode.c
index 8357544..64d721f 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;

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 01/18] autofs: Fix typos in  Documentation/filesystems/autofs4.txt Ian Kent <raven@themaw.net> - 2016-08-12 04:50 +0200
  [PATCH 04/18] autofs - fix autofs4_fill_super() error exit handling Ian Kent <raven@themaw.net> - 2016-08-12 04:50 +0200
  [PATCH 15/18] autofs: Add autofs_dev_ioctl_version() for  AUTOFS_DEV_IOCTL_VERSION_CMD Ian Kent <raven@themaw.net> - 2016-08-12 04:50 +0200
  [PATCH 13/18] autofs: Fix pr_debug() message Ian Kent <raven@themaw.net> - 2016-08-12 04:50 +0200
  [PATCH 18/18] autofs4 - move linux/auto_dev-ioctl.h to uapi/linux Ian Kent <raven@themaw.net> - 2016-08-12 04:50 +0200
  [PATCH 05/18] autofs: Add WARN_ON(1) for non dir/link inode case Ian Kent <raven@themaw.net> - 2016-08-12 04:50 +0200
  [PATCH 06/18] autofs - remove ino free in autofs4_dir_symlink() Ian Kent <raven@themaw.net> - 2016-08-12 04:50 +0200
  [PATCH 11/18] autofs: Fix Documentation regarding devid on ioctl Ian Kent <raven@themaw.net> - 2016-08-12 04:50 +0200
  [PATCH 16/18] autofs: Fix print format for ioctl warning message Ian Kent <raven@themaw.net> - 2016-08-12 04:50 +0200
  [PATCH 09/18] autofs: Don't fail to free_dev_ioctl(param) Ian Kent <raven@themaw.net> - 2016-08-12 05:00 +0200
  [PATCH 14/18] autofs - fix dev ioctl number range check Ian Kent <raven@themaw.net> - 2016-08-12 05:00 +0200
  [PATCH 12/18] autofs: Update struct autofs_dev_ioctl in  Documentation Ian Kent <raven@themaw.net> - 2016-08-12 05:00 +0200
  [PATCH 02/18] autofs: Drop unnecessary extern in autofs_i.h Ian Kent <raven@themaw.net> - 2016-08-12 05:00 +0200

csiph-web