| From 23586b66d84ba3184b8820277f3fc42761640f87 Mon Sep 17 00:00:00 2001 |
| From: Steve French <smfrench@gmail.com> |
| Date: Mon, 18 Sep 2017 18:18:45 -0500 |
| Subject: Fix SMB3.1.1 guest authentication to Samba |
| |
| From: Steve French <smfrench@gmail.com> |
| |
| commit 23586b66d84ba3184b8820277f3fc42761640f87 upstream. |
| |
| Samba rejects SMB3.1.1 dialect (vers=3.1.1) negotiate requests from |
| the kernel client due to the two byte pad at the end of the negotiate |
| contexts. |
| |
| Signed-off-by: Steve French <smfrench@gmail.com> |
| Reviewed-by: Ronnie Sahlberg <lsahlber@redhat.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| fs/cifs/smb2pdu.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/fs/cifs/smb2pdu.c |
| +++ b/fs/cifs/smb2pdu.c |
| @@ -366,7 +366,7 @@ assemble_neg_contexts(struct smb2_negoti |
| build_encrypt_ctxt((struct smb2_encryption_neg_context *)pneg_ctxt); |
| req->NegotiateContextOffset = cpu_to_le32(OFFSET_OF_NEG_CONTEXT); |
| req->NegotiateContextCount = cpu_to_le16(2); |
| - inc_rfc1001_len(req, 4 + sizeof(struct smb2_preauth_neg_context) + 2 |
| + inc_rfc1001_len(req, 4 + sizeof(struct smb2_preauth_neg_context) |
| + sizeof(struct smb2_encryption_neg_context)); /* calculate hash */ |
| } |
| #else |
