Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp3395692pxf; Mon, 22 Mar 2021 05:35:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJybOBjBTGmLjiERme40JypDLuL1wdcRCV7tAKrjwPu9bIdMhS0F+hpcJfFJstpGJZcBwYJO X-Received: by 2002:a17:906:1986:: with SMTP id g6mr18935704ejd.533.1616416520661; Mon, 22 Mar 2021 05:35:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1616416520; cv=none; d=google.com; s=arc-20160816; b=A2E4D+AeMkra1XCC/VW4oLY17etlzZO39tHLfCPxEEM87osegg0/enyQT7IBixhyvP ghmn6DOyDTBUtJIUDG9DXiko86bwLuTTtwMQ/9fdF9ZKfqZDXnM3OK4qnvmqx9nupNwW Dd5IRhzZs2852IOQpVBoy+uAa4w/q0/QaB2ucPb2azRTSyf+/vnbppsOLwUi1S3tY/0Z /Iz5HbkcVRKAwSzWvwBTTCI46CZHM2TjSAQWWLHCMjwq0uqon/et1IZbJUyqZZfxJ5gk W4CK0GQe4s2ATRokXY+CSixL1eOYi2/84mXfDjL37MTYo7I1SqG+0poLwlphORW3WzrM au2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=DjD12lbo9qqa09L2GCSYkGKLvnPG/oNbwI9XOZPLwzY=; b=YDzKxtUfq8fgMQRAptTEW7lu7Gv7MX1XdlHsfFuc40bBVm4hIXpuKuJOW/EWXFa2vy Ao18zMze41+m3KOR9BGJInFXPx7ONnYNbIbwjIrvnpX45VPwe0AEYJcEGQI5jx8FcRLm UP8/4mhSXNKELfPG/dmzQktyB51t//4OPlpbZa9MffaNAT8D3Z1nUhbgUC+hxr0KG2Bi Rwp/Y4KqW2ZUDWZcuwpqXR0Totb1EtPjmMjwF3MsfcIJObSdboPmufJJxR8iWOVr93b5 6K5Du61OGpe5t2o1DMiJwf0ULKGEcq4bul2XIZwegc26K9qpkmUcyj+byitbBgocn/0J AKjQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=FDT7P5Mg; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id n12si11467483eju.209.2021.03.22.05.34.57; Mon, 22 Mar 2021 05:35:20 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=FDT7P5Mg; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231645AbhCVMeD (ORCPT + 99 others); Mon, 22 Mar 2021 08:34:03 -0400 Received: from mail.kernel.org ([198.145.29.99]:54802 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231448AbhCVMcH (ORCPT ); Mon, 22 Mar 2021 08:32:07 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 5D235619A9; Mon, 22 Mar 2021 12:31:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1616416316; bh=4c2RAuqgwg1MwBlAh/lKpuHRFObYcLGScn0rKCOiQBg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FDT7P5MgAnIty2PYq3UsJkbVyrkJLAwRWXCIGPyF3BKR/11KelrrozdAm47qCXUwO E3nEEg7IWUerTR+IxRgfzB8ljKtBN6Cj6fg+D2t1bL7a7eOj6z5Ol7CcvQkZO/bHF8 lHhkmef2oApCIyHOjhUPhFS+iLgef9Qa8ZP1pigM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Aurelien Aptel , Steve French Subject: [PATCH 5.11 060/120] cifs: warn and fail if trying to use rootfs without the config option Date: Mon, 22 Mar 2021 13:27:23 +0100 Message-Id: <20210322121931.692909895@linuxfoundation.org> X-Mailer: git-send-email 2.31.0 In-Reply-To: <20210322121929.669628946@linuxfoundation.org> References: <20210322121929.669628946@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Aurelien Aptel commit af3ef3b1031634724a3763606695ebcd113d782b upstream. If CONFIG_CIFS_ROOT is not set, rootfs mount option is invalid Signed-off-by: Aurelien Aptel CC: # v5.11 Signed-off-by: Steve French Signed-off-by: Greg Kroah-Hartman --- 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)