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

Commit cd2dca60 authored by Paulo Alcantara's avatar Paulo Alcantara Committed by Steve French
Browse files

cifs: Fix encryption/signing 



Since the rfc1002 generation was moved down to __smb_send_rqst(),
the transform header is now in rqst->rq_iov[0].

Correctly assign the transform header pointer in crypt_message().

Signed-off-by: default avatarPaulo Alcantara <palcantara@suse.de>
Reviewed-by: default avatarRonnie Sahlberg <lsahlber@redhat.com>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent 07cd952f

fs/cifs/smb2ops.c

+2 −2
Original line number Diff line number Diff line
@@ -2187,7 +2187,7 @@ static inline void smb2_sg_set_buf(struct scatterlist *sg, const void *buf, 
}



/* Assumes:

 * rqst->rq_iov[0]  is tranform header

 * rqst->rq_iov[0]  is transform header

 * rqst->rq_iov[1+] data to be encrypted/decrypted

 */

static struct scatterlist *
@@ -2249,7 +2249,7 @@ static int 
crypt_message(struct TCP_Server_Info *server, struct smb_rqst *rqst, int enc)

{

	struct smb2_transform_hdr *tr_hdr =

			(struct smb2_transform_hdr *)rqst->rq_iov[1].iov_base;

			(struct smb2_transform_hdr *)rqst->rq_iov[0].iov_base;

	unsigned int assoc_data_len = sizeof(struct smb2_transform_hdr) - 20;

	int rc = 0;

	struct scatterlist *sg;