This is a note to let you know that I've just added the patch titled cifs: warn and fail if trying to use rootfs without the config option to the 5.11-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: cifs-warn-and-fail-if-trying-to-use-rootfs-without-the-config-option.patch and it can be found in the queue-5.11 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From af3ef3b1031634724a3763606695ebcd113d782b Mon Sep 17 00:00:00 2001 From: Aurelien Aptel <aaptel@xxxxxxxx> Date: Thu, 18 Mar 2021 19:17:10 +0100 Subject: cifs: warn and fail if trying to use rootfs without the config option From: Aurelien Aptel <aaptel@xxxxxxxx> commit af3ef3b1031634724a3763606695ebcd113d782b upstream. If CONFIG_CIFS_ROOT is not set, rootfs mount option is invalid Signed-off-by: Aurelien Aptel <aaptel@xxxxxxxx> CC: <stable@xxxxxxxxxxxxxxx> # v5.11 Signed-off-by: Steve French <stfrench@xxxxxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- fs/cifs/fs_context.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) --- a/fs/cifs/fs_context.c +++ b/fs/cifs/fs_context.c @@ -1175,9 +1175,11 @@ static int smb3_fs_context_parse_param(s 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) Patches currently in stable-queue which might be from aaptel@xxxxxxxx are queue-5.11/cifs-fix-allocation-size-on-newly-created-files.patch queue-5.11/cifs-warn-and-fail-if-trying-to-use-rootfs-without-the-config-option.patch