From patchwork Fri Apr 21 14:59:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Aur=C3=A9lien_Aptel?= X-Patchwork-Id: 9693097 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 968E76038D for ; Fri, 21 Apr 2017 15:37:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 88DB3205AF for ; Fri, 21 Apr 2017 15:37:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7BB4624B44; Fri, 21 Apr 2017 15:37: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 67D50206E2 for ; Fri, 21 Apr 2017 15:37:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1038969AbdDUPWd (ORCPT ); Fri, 21 Apr 2017 11:22:33 -0400 Received: from smtp.nue.novell.com ([195.135.221.5]:54459 "EHLO smtp.nue.novell.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1041284AbdDUPW2 (ORCPT ); Fri, 21 Apr 2017 11:22:28 -0400 Received: from localhost (nat.nue.novell.com [195.135.221.2]) by smtp.nue.novell.com with ESMTP (TLS encrypted); Fri, 21 Apr 2017 17:00:26 +0200 From: Aurelien Aptel To: linux-cifs@vger.kernel.org Cc: jlayton@redhat.com, pshilov@microsoft.com, Aurelien Aptel Subject: [PATCH v1 1/1] mount.cifs: document SMBv3.1.1 and new seal option Date: Fri, 21 Apr 2017 16:59:50 +0200 Message-Id: <20170421145950.18641-1-aaptel@suse.com> X-Mailer: git-send-email 2.12.0 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 Signed-off-by: Aurelien Aptel --- mount.cifs.8 | 16 ++++++++++++++++ mount.cifs.c | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/mount.cifs.8 b/mount.cifs.8 index 9104fae..ab35448 100644 --- a/mount.cifs.8 +++ b/mount.cifs.8 @@ -440,6 +440,11 @@ The default in mainline kernel versions prior to v3.8 was sec=ntlm. In v3.8, the If the server requires signing during protocol negotiation, then it may be enabled automatically. Packet signing may also be enabled automatically if it's enabled in /proc/fs/cifs/SecurityFlags. .RE .PP +seal +.RS 4 +Request encryption at the SMB layer. Encryption is only supported in SMBv3 and above. The encryption algorithm used is AES-128-CCM. +.RE +.PP nobrl .RS 4 Do not send byte range lock requests to the server\&. This is necessary for certain applications that break with cifs style mandatory byte range locks (and most cifs servers do not yet support requesting advisory byte range locks)\&. @@ -593,6 +598,17 @@ SMB protocol version. Allowed values are: .\} 3.0 - The SMBv3.0 protocol that was introduced in Microsoft Windows 8 and Windows Server 2012. .RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +3.1.1 or 3.11 - The SMBv3.1.1 protocol that was introduced in Microsoft Windows Server 2016. +.RE .PP Note too that while this option governs the protocol version used, not all features of each version are available. .RE diff --git a/mount.cifs.c b/mount.cifs.c index 2612feb..8ca848d 100644 --- a/mount.cifs.c +++ b/mount.cifs.c @@ -269,7 +269,7 @@ static int mount_usage(FILE * stream) fprintf(stream, "\n\tmapchars,nomapchars,nolock,servernetbiosname="); fprintf(stream, - "\n\tdirectio,nounix,cifsacl,sec=,sign,fsc"); + "\n\tdirectio,nounix,cifsacl,sec=,sign,seal,fsc"); fprintf(stream, "\n\nOptions not needed for servers supporting CIFS Unix extensions"); fprintf(stream,