Commit c119f4ed authored by Namjae Jeon's avatar Namjae Jeon Committed by Steve French

ksmbd: fix slab-out-of-bounds in smb2_allocate_rsp_buf

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: default avatarNorbert Szetei <norbert@doyensec.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarNamjae Jeon <linkinjeon@kernel.org>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent 0bbac3fa
...@@ -167,20 +167,17 @@ static void __handle_ksmbd_work(struct ksmbd_work *work, ...@@ -167,20 +167,17 @@ static void __handle_ksmbd_work(struct ksmbd_work *work,
int rc; int rc;
bool is_chained = false; bool is_chained = false;
if (conn->ops->allocate_rsp_buf(work))
return;
if (conn->ops->is_transform_hdr && if (conn->ops->is_transform_hdr &&
conn->ops->is_transform_hdr(work->request_buf)) { conn->ops->is_transform_hdr(work->request_buf)) {
rc = conn->ops->decrypt_req(work); rc = conn->ops->decrypt_req(work);
if (rc < 0) { if (rc < 0)
conn->ops->set_rsp_status(work, STATUS_DATA_ERROR); return;
goto send;
}
work->encrypted = true; work->encrypted = true;
} }
if (conn->ops->allocate_rsp_buf(work))
return;
rc = conn->ops->init_rsp_hdr(work); rc = conn->ops->init_rsp_hdr(work);
if (rc) { if (rc) {
/* either uid or tid is not correct */ /* either uid or tid is not correct */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment