Skip to content

Commit 2f6d98c

Browse files
gvrose8192PlaidCat
authored andcommitted
nvmet-tcp: Fix a possible UAF in queue intialization setup
jira VULN-3190 cve CVE-2023-5178 commit-author Sagi Grimberg <[email protected]> commit d920abd From Alon: "Due to a logical bug in the NVMe-oF/TCP subsystem in the Linux kernel, a malicious user can cause a UAF and a double free, which may lead to RCE (may also lead to an LPE in case the attacker already has local privileges)." Hence, when a queue initialization fails after the ahash requests are allocated, it is guaranteed that the queue removal async work will be called, hence leave the deallocation to the queue removal. Also, be extra careful not to continue processing the socket, so set queue rcv_state to NVMET_TCP_RECV_ERR upon a socket error. Cc: [email protected] Reported-by: Alon Zahavi <[email protected]> Tested-by: Alon Zahavi <[email protected]> Signed-off-by: Sagi Grimberg <[email protected]> Reviewed-by: Christoph Hellwig <[email protected]> Reviewed-by: Chaitanya Kulkarni <[email protected]> Signed-off-by: Keith Busch <[email protected]> (cherry picked from commit d920abd) Signed-off-by: Greg Rose <[email protected]>
1 parent ea9cab1 commit 2f6d98c

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

drivers/nvme/target/tcp.c

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -363,6 +363,7 @@ static void nvmet_tcp_fatal_error(struct nvmet_tcp_queue *queue)
363363

364364
static void nvmet_tcp_socket_error(struct nvmet_tcp_queue *queue, int status)
365365
{
366+
queue->rcv_state = NVMET_TCP_RECV_ERR;
366367
if (status == -EPIPE || status == -ECONNRESET)
367368
kernel_sock_shutdown(queue->sock, SHUT_RDWR);
368369
else
@@ -906,15 +907,11 @@ static int nvmet_tcp_handle_icreq(struct nvmet_tcp_queue *queue)
906907
iov.iov_len = sizeof(*icresp);
907908
ret = kernel_sendmsg(queue->sock, &msg, &iov, 1, iov.iov_len);
908909
if (ret < 0)
909-
goto free_crypto;
910+
return ret; /* queue removal will cleanup */
910911

911912
queue->state = NVMET_TCP_Q_LIVE;
912913
nvmet_prepare_receive_pdu(queue);
913914
return 0;
914-
free_crypto:
915-
if (queue->hdr_digest || queue->data_digest)
916-
nvmet_tcp_free_crypto(queue);
917-
return ret;
918915
}
919916

920917
static void nvmet_tcp_handle_req_failure(struct nvmet_tcp_queue *queue,

0 commit comments

Comments
 (0)