From patchwork Thu Aug 31 21:01:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thorsten Leemhuis X-Patchwork-Id: 9932953 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 2E0D960309 for ; Thu, 31 Aug 2017 21:22:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1F4262237D for ; Thu, 31 Aug 2017 21:22:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 140422521E; Thu, 31 Aug 2017 21:22:12 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0AF322237D for ; Thu, 31 Aug 2017 21:22:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751412AbdHaVWK (ORCPT ); Thu, 31 Aug 2017 17:22:10 -0400 Received: from wp227.webpack.hosteurope.de ([80.237.132.234]:42416 "EHLO wp227.webpack.hosteurope.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751110AbdHaVWJ (ORCPT ); Thu, 31 Aug 2017 17:22:09 -0400 X-Greylist: delayed 1228 seconds by postgrey-1.27 at vger.kernel.org; Thu, 31 Aug 2017 17:22:09 EDT Received: from ip4d15e3ad.dynamic.kabel-deutschland.de ([77.21.227.173] helo=truhe.fritz.box); authenticated by wp227.webpack.hosteurope.de running ExIM with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) id 1dnWap-0007Gj-A1; Thu, 31 Aug 2017 23:01:39 +0200 From: Thorsten Leemhuis To: Steve French Cc: Linus Torvalds , Linux Kernel Mailing List , linux-cifs@vger.kernel.org, Pavel Shilovsky Subject: RFC: Revert move default dialect from CIFS to to SMB3" Date: Thu, 31 Aug 2017 23:01:38 +0200 Message-Id: <1504213298-27431-1-git-send-email-linux@leemhuis.info> X-Mailer: git-send-email 1.8.3.1 X-bounce-key: webpack.hosteurope.de; linux@leemhuis.info; 1504214529; 783c7259; X-HE-SMSGID: 1dnWap-0007Gj-A1 Sender: linux-cifs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-cifs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This reverts commit eef914a9eb5eb83e60eb498315a491cd1edc13a1 ( [SMB3] Improve security, move default dialect to SMB3 from old CIFS), as it confuses users: https://bugzilla.kernel.org/show_bug.cgi?id=196599 It was a patch to improve security by switching to SMB3 by default and support SMB1 (aka CIFS) only when explicitly requested, as the latter is not considered secure anymore (see below for details). This is one of the rare cases where regressions are unavoidable and accepted in Linux. But that's bad enough already, so we at least should make it easy for people to get an idea why something suddenly stopped working with a newer kernel version. That's not the case, because due to eef914a9eb5e a mount of a server that only supports CIFS/SMB1 with mount.cifs fails with a misleading message: > mount error(112): Host is down > Refer to the mount.cifs(8) manual > page (e.g. man mount.cifs) The corresponding message in the kernel log is just as unhelpful: > CIFS VFS: cifs_mount failed w/return code = -112 This needs to be improved. Hence remove this for now, as the world won't end suddenly if this gets delayed one or two cycles and resubmitted in a way that leads to a more helpful error message. For completeness, here are parts from the original patch description: > Due to recent publicity about security vulnerabilities in the much > older CIFS dialect, move the default dialect to the widely accepted > (and quite secure) SMB3.0 dialect from the old default of the CIFS > dialect. > > We do not want to be encouraging use of less secure dialects, and > both Microsoft and CERT now strongly recommend not using the older > CIFS dialect (SMB Security Best Practices "recommends disabling > SMBv1"). > > SMB3 is both secure and widely available: in Windows 8 and later, > Samba and Macs. > > Users can still choose to explicitly mount with the less secure > dialect (for old servers) by choosing "vers=1.0" on the cifs mount Signed-off-by: Thorsten Leemhuis CC: Steve French CC: Pavel Shilovsky Reviewed-by: Ronnie Sahlberg --- fs/cifs/connect.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index 59647eb..6ab261cd 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c @@ -1272,9 +1272,9 @@ static int cifs_parse_security_flavors(char *value, vol->actimeo = CIFS_DEF_ACTIMEO; - /* FIXME: add autonegotiation for SMB3 or later rather than just SMB3 */ - vol->ops = &smb30_operations; /* both secure and accepted widely */ - vol->vals = &smb30_values; + /* FIXME: add autonegotiation -- for now, SMB1 is default */ + vol->ops = &smb1_operations; + vol->vals = &smb1_values; vol->echo_interval = SMB_ECHO_INTERVAL_DEFAULT;