ksmbd: remove smb2_buf_length in smb2_transform_hdr

[ Upstream commit 2dd9129f7dec1de369e4447a54ea2edf695f765b ]

To move smb2_transform_hdr to smbfs_common, This patch remove
smb2_buf_length variable in smb2_transform_hdr.

Cc: Ronnie Sahlberg <ronniesahlberg@gmail.com>
Signed-off-by: Namjae Jeon <linkinjeon@kernel.org>
Signed-off-by: Steve French <stfrench@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/fs/ksmbd/auth.c b/fs/ksmbd/auth.c
index 3258a3176c06947340f34865433a0cc9bc75c35f..33cb94ed6f66144a79df08fd15e231bee414842e 100644 (file)
--- a/fs/ksmbd/auth.c
+++ b/fs/ksmbd/auth.c
@@ -994,7 +994,7 @@ static struct scatterlist *ksmbd_init_sg(struct kvec *iov, unsigned int nvec,
                                         u8 *sign)
 {
        struct scatterlist *sg;
-       unsigned int assoc_data_len = sizeof(struct smb2_transform_hdr) - 24;
+       unsigned int assoc_data_len = sizeof(struct smb2_transform_hdr) - 20;
        int i, nr_entries[3] = {0}, total_entries = 0, sg_idx = 0;
 
        if (!nvec)
@@ -1058,9 +1058,8 @@ static struct scatterlist *ksmbd_init_sg(struct kvec *iov, unsigned int nvec,
 int ksmbd_crypt_message(struct ksmbd_conn *conn, struct kvec *iov,
                        unsigned int nvec, int enc)
 {
-       struct smb2_transform_hdr *tr_hdr =
-               (struct smb2_transform_hdr *)iov[0].iov_base;
-       unsigned int assoc_data_len = sizeof(struct smb2_transform_hdr) - 24;
+       struct smb2_transform_hdr *tr_hdr = smb2_get_msg(iov[0].iov_base);
+       unsigned int assoc_data_len = sizeof(struct smb2_transform_hdr) - 20;
        int rc;
        struct scatterlist *sg;
        u8 sign[SMB2_SIGNATURE_SIZE] = {};

diff --git a/fs/ksmbd/connection.c b/fs/ksmbd/connection.c
index e4af77581c2f15e23510591154f919c910821a52..ddf447e9b8bfc0d3aa2d1141abbd71994743e52d 100644 (file)
--- a/fs/ksmbd/connection.c
+++ b/fs/ksmbd/connection.c
@@ -173,7 +173,7 @@ int ksmbd_conn_write(struct ksmbd_work *work)
 
        if (work->tr_buf) {
                iov[iov_idx] = (struct kvec) { work->tr_buf,
-                               sizeof(struct smb2_transform_hdr) };
+                               sizeof(struct smb2_transform_hdr) + 4 };
                len += iov[iov_idx++].iov_len;
        }
 

diff --git a/fs/ksmbd/smb2pdu.c b/fs/ksmbd/smb2pdu.c
index f0bc071074ae7043f7fce4826835a80ffb0df3b2..c7962dcaec919dfc5b02981a1021ab60164bfb96 100644 (file)
--- a/fs/ksmbd/smb2pdu.c
+++ b/fs/ksmbd/smb2pdu.c
@@ -8572,13 +8572,13 @@ void smb3_preauth_hash_rsp(struct ksmbd_work *work)
        }
 }
 
-static void fill_transform_hdr(struct smb2_transform_hdr *tr_hdr, char *old_buf,
-                              __le16 cipher_type)
+static void fill_transform_hdr(void *tr_buf, char *old_buf, __le16 cipher_type)
 {
-       struct smb2_hdr *hdr = (struct smb2_hdr *)old_buf;
+       struct smb2_transform_hdr *tr_hdr = tr_buf + 4;
+       struct smb2_hdr *hdr = smb2_get_msg(old_buf);
        unsigned int orig_len = get_rfc1002_len(old_buf);
 
-       memset(tr_hdr, 0, sizeof(struct smb2_transform_hdr));
+       memset(tr_buf, 0, sizeof(struct smb2_transform_hdr) + 4);
        tr_hdr->ProtocolId = SMB2_TRANSFORM_PROTO_NUM;
        tr_hdr->OriginalMessageSize = cpu_to_le32(orig_len);
        tr_hdr->Flags = cpu_to_le16(0x01);
@@ -8588,14 +8588,13 @@ static void fill_transform_hdr(struct smb2_transform_hdr *tr_hdr, char *old_buf,
        else
                get_random_bytes(&tr_hdr->Nonce, SMB3_AES_CCM_NONCE);
        memcpy(&tr_hdr->SessionId, &hdr->SessionId, 8);
-       inc_rfc1001_len(tr_hdr, sizeof(struct smb2_transform_hdr) - 4);
-       inc_rfc1001_len(tr_hdr, orig_len);
+       inc_rfc1001_len(tr_buf, sizeof(struct smb2_transform_hdr));
+       inc_rfc1001_len(tr_buf, orig_len);
 }
 
 int smb3_encrypt_resp(struct ksmbd_work *work)
 {
        char *buf = work->response_buf;
-       struct smb2_transform_hdr *tr_hdr;
        struct kvec iov[3];
        int rc = -ENOMEM;
        int buf_size = 0, rq_nvec = 2 + (work->aux_payload_sz ? 1 : 0);
@@ -8603,15 +8602,15 @@ int smb3_encrypt_resp(struct ksmbd_work *work)
        if (ARRAY_SIZE(iov) < rq_nvec)
                return -ENOMEM;
 
-       tr_hdr = kzalloc(sizeof(struct smb2_transform_hdr), GFP_KERNEL);
-       if (!tr_hdr)
+       work->tr_buf = kzalloc(sizeof(struct smb2_transform_hdr) + 4, GFP_KERNEL);
+       if (!work->tr_buf)
                return rc;
 
        /* fill transform header */
-       fill_transform_hdr(tr_hdr, buf, work->conn->cipher_type);
+       fill_transform_hdr(work->tr_buf, buf, work->conn->cipher_type);
 
-       iov[0].iov_base = tr_hdr;
-       iov[0].iov_len = sizeof(struct smb2_transform_hdr);
+       iov[0].iov_base = work->tr_buf;
+       iov[0].iov_len = sizeof(struct smb2_transform_hdr) + 4;
        buf_size += iov[0].iov_len - 4;
 
        iov[1].iov_base = buf + 4;
@@ -8631,15 +8630,14 @@ int smb3_encrypt_resp(struct ksmbd_work *work)
                return rc;
 
        memmove(buf, iov[1].iov_base, iov[1].iov_len);
-       tr_hdr->smb2_buf_length = cpu_to_be32(buf_size);
-       work->tr_buf = tr_hdr;
+       *(__be32 *)work->tr_buf = cpu_to_be32(buf_size);
 
        return rc;
 }
 
 bool smb3_is_transform_hdr(void *buf)
 {
-       struct smb2_transform_hdr *trhdr = buf;
+       struct smb2_transform_hdr *trhdr = smb2_get_msg(buf);
 
        return trhdr->ProtocolId == SMB2_TRANSFORM_PROTO_NUM;
 }
@@ -8651,9 +8649,8 @@ int smb3_decrypt_req(struct ksmbd_work *work)
        char *buf = work->request_buf;
        unsigned int pdu_length = get_rfc1002_len(buf);
        struct kvec iov[2];
-       int buf_data_size = pdu_length + 4 -
-               sizeof(struct smb2_transform_hdr);
-       struct smb2_transform_hdr *tr_hdr = (struct smb2_transform_hdr *)buf;
+       int buf_data_size = pdu_length - sizeof(struct smb2_transform_hdr);
+       struct smb2_transform_hdr *tr_hdr = smb2_get_msg(buf);
        int rc = 0;
 
        if (pdu_length < sizeof(struct smb2_transform_hdr) ||
@@ -8676,8 +8673,8 @@ int smb3_decrypt_req(struct ksmbd_work *work)
        }
 
        iov[0].iov_base = buf;
-       iov[0].iov_len = sizeof(struct smb2_transform_hdr);
-       iov[1].iov_base = buf + sizeof(struct smb2_transform_hdr);
+       iov[0].iov_len = sizeof(struct smb2_transform_hdr) + 4;
+       iov[1].iov_base = buf + sizeof(struct smb2_transform_hdr) + 4;
        iov[1].iov_len = buf_data_size;
        rc = ksmbd_crypt_message(conn, iov, 2, 0);
        if (rc)

diff --git a/fs/ksmbd/smb2pdu.h b/fs/ksmbd/smb2pdu.h
index ebbdb6476c11ee78abdda0e4dfaa0ba71107a40a..2175ab5fb55711a0e674866fa06c3a821a7cf384 100644 (file)
--- a/fs/ksmbd/smb2pdu.h
+++ b/fs/ksmbd/smb2pdu.h
@@ -160,11 +160,6 @@ struct smb2_pdu {
 #define SMB3_AES_GCM_NONCE 12
 
 struct smb2_transform_hdr {
-       __be32 smb2_buf_length; /* big endian on wire */
-       /*
-        * length is only two or three bytes - with
-        * one or two byte type preceding it that MBZ
-        */
        __le32 ProtocolId;      /* 0xFD 'S' 'M' 'B' */
        __u8   Signature[16];
        __u8   Nonce[16];