]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ksmbd: Use unsafe_memcpy() for ntlm_negotiate
authorNamjae Jeon <linkinjeon@kernel.org>
Wed, 14 Aug 2024 23:56:35 +0000 (08:56 +0900)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 6 Jul 2025 09:00:16 +0000 (11:00 +0200)
commit dfd046d0ced19b6ff5f11ec4ceab0a83de924771 upstream.

rsp buffer is allocated larger than spnego_blob from
smb2_allocate_rsp_buf().

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>
fs/smb/server/smb2pdu.c

index 185f7e0744f8a8c8f928ceddd3a0e05b15633662..9edf84da099f4b79d5b1b9ac8fa02fc858eac0f0 100644 (file)
@@ -1380,7 +1380,8 @@ static int ntlm_negotiate(struct ksmbd_work *work,
        }
 
        sz = le16_to_cpu(rsp->SecurityBufferOffset);
-       memcpy((char *)&rsp->hdr.ProtocolId + sz, spnego_blob, spnego_blob_len);
+       unsafe_memcpy((char *)&rsp->hdr.ProtocolId + sz, spnego_blob, spnego_blob_len,
+                       /* alloc is larger than blob, see smb2_allocate_rsp_buf() */);
        rsp->SecurityBufferLength = cpu_to_le16(spnego_blob_len);
 
 out:
@@ -1463,7 +1464,9 @@ static int ntlm_authenticate(struct ksmbd_work *work,
                        return -ENOMEM;
 
                sz = le16_to_cpu(rsp->SecurityBufferOffset);
-               memcpy((char *)&rsp->hdr.ProtocolId + sz, spnego_blob, spnego_blob_len);
+               unsafe_memcpy((char *)&rsp->hdr.ProtocolId + sz, spnego_blob,
+                               spnego_blob_len,
+                               /* alloc is larger than blob, see smb2_allocate_rsp_buf() */);
                rsp->SecurityBufferLength = cpu_to_le16(spnego_blob_len);
                kfree(spnego_blob);
        }