From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 29DE5C43387 for ; Thu, 20 Dec 2018 09:22:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EA5C32177B for ; Thu, 20 Dec 2018 09:22:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1545297737; bh=zr9XlMWKtPuDsY6qAi6NWnhw2+eYnhxUelc+dhkaXd0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=KSGIXGuJL8kG/isc6QzVFea6udwIVRFQnLqiOqF+cq+xtC9Ync9UgnGa6dGNIBUVa WM7ElOJLfCX/GeHZrpvesnEPwOLNk/f675760d/6bYM9iJGWICfBqmFRn7l76ppV3u ZRY337qnJUWD3IpgE+IMELIo+0ysEpXkeqcFtXj0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731291AbeLTJWP (ORCPT ); Thu, 20 Dec 2018 04:22:15 -0500 Received: from mail.kernel.org ([198.145.29.99]:41466 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731257AbeLTJWL (ORCPT ); Thu, 20 Dec 2018 04:22:11 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 8570C217D7; Thu, 20 Dec 2018 09:22:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1545297731; bh=zr9XlMWKtPuDsY6qAi6NWnhw2+eYnhxUelc+dhkaXd0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SQut3KaWWbhrnS/ViSDiPs2EovT5+0F/3NDB3pxYPCMEyp7YpvVnSv/W5bBe5W/20 39G5Uev7wGMY0TFSx3B/Lh8gGms5fhqvmxdixTA2OREKuko8L17y4SgqkL4mVPJ0iA sCjV4n5bgt19oq17nSz2YMpJpduvqOvXeJtp7Slw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Steve French , Pavel Shilovsky , Sasha Levin Subject: [PATCH 4.4 35/40] cifs: In Kconfig CONFIG_CIFS_POSIX needs depends on legacy (insecure cifs) Date: Thu, 20 Dec 2018 10:18:47 +0100 Message-Id: <20181220085827.851468105@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20181220085826.212663515@linuxfoundation.org> References: <20181220085826.212663515@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.4-stable review patch. If anyone has any objections, please let me know. ------------------ [ Upstream commit 6e785302dad32228819d8066e5376acd15d0e6ba ] Missing a dependency. Shouldn't show cifs posix extensions in Kconfig if CONFIG_CIFS_ALLOW_INSECURE_DIALECTS (ie SMB1 protocol) is disabled. Signed-off-by: Steve French Reviewed-by: Pavel Shilovsky Signed-off-by: Sasha Levin --- fs/cifs/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/cifs/Kconfig b/fs/cifs/Kconfig index e7b478b49985..8bef27b8f85d 100644 --- a/fs/cifs/Kconfig +++ b/fs/cifs/Kconfig @@ -111,7 +111,7 @@ config CIFS_XATTR config CIFS_POSIX bool "CIFS POSIX Extensions" - depends on CIFS_XATTR + depends on CIFS && CIFS_ALLOW_INSECURE_LEGACY && CIFS_XATTR help Enabling this option will cause the cifs client to attempt to negotiate a newer dialect with servers, such as Samba 3.0.5 -- 2.19.1