Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f2d395b7 authored by Steve French's avatar Steve French Committed by Greg Kroah-Hartman
Browse files

Fix SMB3.1.1 guest authentication to Samba 



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: default avatarSteve French <smfrench@gmail.com>
Reviewed-by: default avatarRonnie Sahlberg <lsahlber@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3a02f8cb

fs/cifs/smb2pdu.c

+1 −1
Original line number Diff line number Diff line
@@ -366,7 +366,7 @@ assemble_neg_contexts(struct smb2_negotiate_req *req) 
	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