From: Ian Kent <raven@themaw.net>
To: Al Viro <viro@ZenIV.linux.org.uk>,
Christian Brauner <brauner@kernel.org>
Cc: autofs mailing list <autofs@vger.kernel.org>,
linux-fsdevel <linux-fsdevel@vger.kernel.org>,
Kernel Mailing List <linux-kernel@vger.kernel.org>,
Bill O'Donnell <billodo@redhat.com>,
Miklos Szeredi <miklos@szeredi.hu>,
David Howells <dhowells@redhat.com>, Ian Kent <raven@themaw.net>
Subject: [PATCH 6/8] autofs: validate protocol version
Date: Fri, 22 Sep 2023 12:12:13 +0800 [thread overview]
Message-ID: <20230922041215.13675-7-raven@themaw.net> (raw)
In-Reply-To: <20230922041215.13675-1-raven@themaw.net>
Move the protocol parameter validation into a seperate function.
Signed-off-by: Ian Kent <raven@themaw.net>
---
fs/autofs/inode.c | 38 +++++++++++++++++++++++---------------
1 file changed, 23 insertions(+), 15 deletions(-)
diff --git a/fs/autofs/inode.c b/fs/autofs/inode.c
index 5e061ce3ab8d..e2026e063d8c 100644
--- a/fs/autofs/inode.c
+++ b/fs/autofs/inode.c
@@ -287,6 +287,28 @@ static struct autofs_sb_info *autofs_alloc_sbi(void)
return sbi;
}
+static int autofs_validate_protocol(struct autofs_sb_info *sbi)
+{
+ /* 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);
+ return -EINVAL;
+ }
+
+ /* 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;
+
+ return 0;
+}
+
int autofs_fill_super(struct super_block *s, void *data, int silent)
{
struct inode *root_inode;
@@ -335,22 +357,8 @@ int autofs_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);
+ if (autofs_validate_protocol(sbi))
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);
--
2.41.0
next prev parent reply other threads:[~2023-09-22 4:13 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-22 4:12 [PATCH 0/8] autofs - convert to to use mount api Ian Kent
2023-09-22 4:12 ` [PATCH 1/8] autofs: refactor autofs_prepare_pipe() Ian Kent
2023-09-22 4:12 ` [PATCH 2/8] autofs: add autofs_parse_fd() Ian Kent
2023-09-22 4:12 ` [PATCH 3/8] autofs: refactor super block info init Ian Kent
2023-09-22 4:12 ` [PATCH 4/8] autofs: reformat 0pt enum declaration Ian Kent
2023-09-22 4:12 ` [PATCH 5/8] autofs: refactor parse_options() Ian Kent
2023-09-22 4:12 ` Ian Kent [this message]
2023-09-22 4:12 ` [PATCH 7/8] autofs: convert autofs to use the new mount api Ian Kent
2023-09-22 8:31 ` Christian Brauner
2023-09-22 9:33 ` Ian Kent
2023-09-22 11:59 ` Christian Brauner
2023-09-22 13:27 ` Ian Kent
2023-09-26 6:53 ` Ian Kent
2023-09-22 4:12 ` [PATCH 8/8] autofs: fix protocol sub version setting Ian Kent
2023-09-22 12:11 ` [PATCH 0/8] autofs - convert to to use mount api Christian Brauner
2023-09-22 13:25 ` Bill O'Donnell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230922041215.13675-7-raven@themaw.net \
--to=raven@themaw.net \
--cc=autofs@vger.kernel.org \
--cc=billodo@redhat.com \
--cc=brauner@kernel.org \
--cc=dhowells@redhat.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=miklos@szeredi.hu \
--cc=viro@ZenIV.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®