From: Aurelien Aptel <aaptel@suse.com>
Date: Thu, 18 Mar 2021 18:17:10 +0000 (+0100)
Subject: cifs: warn and fail if trying to use rootfs without the config option
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=af3ef3b1031634724a3763606695ebcd113d782b;p=linux.git

cifs: warn and fail if trying to use rootfs without the config option

If CONFIG_CIFS_ROOT is not set, rootfs mount option is invalid

Signed-off-by: Aurelien Aptel <aaptel@suse.com>
CC: <stable@vger.kernel.org> # v5.11
Signed-off-by: Steve French <stfrench@microsoft.com>
---

diff --git a/fs/cifs/fs_context.c b/fs/cifs/fs_context.c
index 892f51a21278b..78889024a7ed0 100644
--- a/fs/cifs/fs_context.c
+++ b/fs/cifs/fs_context.c
@@ -1196,9 +1196,11 @@ static int smb3_fs_context_parse_param(struct fs_context *fc,
 		pr_warn_once("Witness protocol support is experimental\n");
 		break;
 	case Opt_rootfs:
-#ifdef CONFIG_CIFS_ROOT
-		ctx->rootfs = true;
+#ifndef CONFIG_CIFS_ROOT
+		cifs_dbg(VFS, "rootfs support requires CONFIG_CIFS_ROOT config option\n");
+		goto cifs_parse_mount_err;
 #endif
+		ctx->rootfs = true;
 		break;
 	case Opt_posixpaths:
 		if (result.negated)