]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
cifs: Accept validate negotiate if server return NT_STATUS_NOT_SUPPORTED
authorNamjae Jeon <linkinjeon@gmail.com>
Tue, 22 Jan 2019 00:46:45 +0000 (09:46 +0900)
committerKleber Sacilotto de Souza <kleber.souza@canonical.com>
Wed, 14 Aug 2019 09:18:49 +0000 (11:18 +0200)
BugLink: https://bugs.launchpad.net/bugs/1838116
[ Upstream commit 969ae8e8d4ee54c99134d3895f2adf96047f5bee ]

Old windows version or Netapp SMB server will return
NT_STATUS_NOT_SUPPORTED since they do not allow or implement
FSCTL_VALIDATE_NEGOTIATE_INFO. The client should accept the response
provided it's properly signed.

See
https://blogs.msdn.microsoft.com/openspecification/2012/06/28/smb3-secure-dialect-negotiation/

and

MS-SMB2 validate negotiate response processing:
https://msdn.microsoft.com/en-us/library/hh880630.aspx

Samba client had already handled it.
https://bugzilla.samba.org/attachment.cgi?id=13285&action=edit

Signed-off-by: Namjae Jeon <linkinjeon@gmail.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>
fs/cifs/smb2pdu.c

index 31872124d94347b538bbcb8df3c5621b6781a64c..a428732d8a3e9839000b85767b4186870a610892 100644 (file)
@@ -726,8 +726,14 @@ int smb3_validate_negotiate(const unsigned int xid, struct cifs_tcon *tcon)
        rc = SMB2_ioctl(xid, tcon, NO_FILE_ID, NO_FILE_ID,
                FSCTL_VALIDATE_NEGOTIATE_INFO, true /* is_fsctl */,
                (char *)pneg_inbuf, inbuflen, (char **)&pneg_rsp, &rsplen);
-
-       if (rc != 0) {
+       if (rc == -EOPNOTSUPP) {
+               /*
+                * Old Windows versions or Netapp SMB server can return
+                * not supported error. Client should accept it.
+                */
+               cifs_dbg(VFS, "Server does not support validate negotiate\n");
+               return 0;
+       } else if (rc != 0) {
                cifs_dbg(VFS, "validate protocol negotiate failed: %d\n", rc);
                rc = -EIO;
                goto out_free_inbuf;