[SRU,Trusty,1/1] SMB3: Validate negotiate request must always be signed

Message ID b6af8a41b633ef403f57870ab825b0dbb08ff122.1509658635.git.joseph.salisbury@canonical.com
State New
Headers show
Series
  • [SRU,Trusty,1/1] SMB3: Validate negotiate request must always be signed
Related show

Commit Message

Joseph Salisbury Nov. 3, 2017, 4:49 p.m.
From: Steve French <smfrench@gmail.com>

BugLink: http://bugs.launchpad.net/bugs/1729337

According to MS-SMB2 3.2.55 validate_negotiate request must
always be signed. Some Windows can fail the request if you send it unsigned

See kernel bugzilla bug 197311

CC: Stable <stable@vger.kernel.org>
Acked-by: Ronnie Sahlberg <lsahlber.redhat.com>
Signed-off-by: Steve French <smfrench@gmail.com>
(back ported from commit 4587eee04e2ac7ac3ac9fa2bc164fb6e548f99cd)
Signed-off-by: Joseph Salisbury <joseph.salisbury@canonical.com>
---
 fs/cifs/smb2pdu.c | 3 +++
 1 file changed, 3 insertions(+)

Patch

diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c
index 1b84dae..07883c5 100644
--- a/fs/cifs/smb2pdu.c
+++ b/fs/cifs/smb2pdu.c
@@ -1299,6 +1299,9 @@  SMB2_ioctl(const unsigned int xid, struct cifs_tcon *tcon, u64 persistent_fid,
 	} else
 		iov[0].iov_len = get_rfc1002_length(req) + 4;
 
+	/* validate negotiate request must be signed - see MS-SMB2 3.2.5.5 */
+	if (opcode == FSCTL_VALIDATE_NEGOTIATE_INFO)
+		req->hdr.Flags |= SMB2_FLAGS_SIGNED;
 
 	rc = SendReceive2(xid, ses, iov, num_iovecs, &resp_buftype, 0);
 	rsp = (struct smb2_ioctl_rsp *)iov[0].iov_base;