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

Commit 1973a122 authored by Ian Kent's avatar Ian Kent Committed by Linus Torvalds
Browse files

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: default avatarIan Kent <raven@themaw.net>
Cc: Tomohiro Kusumi <kusumi.tomohiro@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 749800ef

fs/autofs4/inode.c

+3 −3
Original line number Diff line number Diff line
@@ -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;