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

Commit 749800ef authored by Tomohiro Kusumi's avatar Tomohiro Kusumi Committed by Linus Torvalds
Browse files

autofs: test autofs versions first on sb initialization 

This patch does what the below comment says.  It could be and it's
considered better to do this first before various functions get called
during initialization.

/* Couldn't this be tested earlier? */

Link: http://lkml.kernel.org/r/20160812024744.12352.43075.stgit@pluto.themaw.net


Signed-off-by: default avatarTomohiro Kusumi <kusumi.tomohiro@gmail.com>
Signed-off-by: default avatarIan Kent <raven@themaw.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 4a44c185

fs/autofs4/inode.c

+17 −17
Original line number Diff line number Diff line
@@ -274,6 +274,23 @@ int autofs4_fill_super(struct super_block *s, void *data, int silent) 
		goto fail_dput;

	}



	/* Test versions first */

	if (sbi->max_proto < AUTOFS_MIN_PROTO_VERSION ||

	    sbi->min_proto > AUTOFS_MAX_PROTO_VERSION) {

		pr_err("kernel does not match daemon version "

		       "daemon (%d, %d) kernel (%d, %d)\n",

		       sbi->min_proto, sbi->max_proto,

		       AUTOFS_MIN_PROTO_VERSION, AUTOFS_MAX_PROTO_VERSION);

		goto fail_dput;

	}



	/* Establish highest kernel protocol version */

	if (sbi->max_proto > AUTOFS_MAX_PROTO_VERSION)

		sbi->version = AUTOFS_MAX_PROTO_VERSION;

	else

		sbi->version = sbi->max_proto;

	sbi->sub_version = AUTOFS_PROTO_SUBVERSION;



	if (pgrp_set) {

		sbi->oz_pgrp = find_get_pid(pgrp);

		if (!sbi->oz_pgrp) {
@@ -291,23 +308,6 @@ int autofs4_fill_super(struct super_block *s, void *data, int silent) 
	root_inode->i_fop = &autofs4_root_operations;

	root_inode->i_op = &autofs4_dir_inode_operations;



	/* Couldn't this be tested earlier? */

	if (sbi->max_proto < AUTOFS_MIN_PROTO_VERSION ||

	    sbi->min_proto > AUTOFS_MAX_PROTO_VERSION) {

		pr_err("kernel does not match daemon version "

		       "daemon (%d, %d) kernel (%d, %d)\n",

		       sbi->min_proto, sbi->max_proto,

		       AUTOFS_MIN_PROTO_VERSION, AUTOFS_MAX_PROTO_VERSION);

		goto fail_dput;

	}



	/* Establish highest kernel protocol version */

	if (sbi->max_proto > AUTOFS_MAX_PROTO_VERSION)

		sbi->version = AUTOFS_MAX_PROTO_VERSION;

	else

		sbi->version = sbi->max_proto;

	sbi->sub_version = AUTOFS_PROTO_SUBVERSION;



	pr_debug("pipe fd = %d, pgrp = %u\n", pipefd, pid_nr(sbi->oz_pgrp));

	pipe = fget(pipefd);