Skip to content

Commit

Permalink
ksmbd: fix slab-out-of-bounds in smb2_allocate_rsp_buf
Browse files Browse the repository at this point in the history
commit c119f4e upstream.

If ->ProtocolId is SMB2_TRANSFORM_PROTO_NUM, smb2 request size
validation could be skipped. if request size is smaller than
sizeof(struct smb2_query_info_req), slab-out-of-bounds read can happen in
smb2_allocate_rsp_buf(). This patch allocate response buffer after
decrypting transform request. smb3_decrypt_req() will validate transform
request size and avoid slab-out-of-bound in smb2_allocate_rsp_buf().

Reported-by: Norbert Szetei <norbert@doyensec.com>
Cc: stable@vger.kernel.org
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>
  • Loading branch information
namjaejeon authored and gregkh committed Apr 27, 2024
1 parent 6355b46 commit 3160d97
Showing 1 changed file with 5 additions and 8 deletions.
13 changes: 5 additions & 8 deletions fs/smb/server/server.c
Expand Up @@ -167,20 +167,17 @@ static void __handle_ksmbd_work(struct ksmbd_work *work,
int rc;
bool is_chained = false;

if (conn->ops->allocate_rsp_buf(work))
return;

if (conn->ops->is_transform_hdr &&
conn->ops->is_transform_hdr(work->request_buf)) {
rc = conn->ops->decrypt_req(work);
if (rc < 0) {
conn->ops->set_rsp_status(work, STATUS_DATA_ERROR);
goto send;
}

if (rc < 0)
return;
work->encrypted = true;
}

if (conn->ops->allocate_rsp_buf(work))
return;

rc = conn->ops->init_rsp_hdr(work);
if (rc) {
/* either uid or tid is not correct */
Expand Down

0 comments on commit 3160d97

Please sign in to comment.