Skip to content

Commit 0851767

Browse files
committed
nvmet-tcp: Fix a possible UAF in queue intialization setup
jira VULN-6745 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 9be1540 commit 0851767

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

drivers/nvme/target/tcp.c

+2-5
Original file line numberDiff line numberDiff line change
@@ -346,6 +346,7 @@ static void nvmet_tcp_fatal_error(struct nvmet_tcp_queue *queue)
346346

347347
static void nvmet_tcp_socket_error(struct nvmet_tcp_queue *queue, int status)
348348
{
349+
queue->rcv_state = NVMET_TCP_RECV_ERR;
349350
if (status == -EPIPE || status == -ECONNRESET)
350351
kernel_sock_shutdown(queue->sock, SHUT_RDWR);
351352
else
@@ -872,15 +873,11 @@ static int nvmet_tcp_handle_icreq(struct nvmet_tcp_queue *queue)
872873
iov.iov_len = sizeof(*icresp);
873874
ret = kernel_sendmsg(queue->sock, &msg, &iov, 1, iov.iov_len);
874875
if (ret < 0)
875-
goto free_crypto;
876+
return ret; /* queue removal will cleanup */
876877

877878
queue->state = NVMET_TCP_Q_LIVE;
878879
nvmet_prepare_receive_pdu(queue);
879880
return 0;
880-
free_crypto:
881-
if (queue->hdr_digest || queue->data_digest)
882-
nvmet_tcp_free_crypto(queue);
883-
return ret;
884881
}
885882

886883
static void nvmet_tcp_handle_req_failure(struct nvmet_tcp_queue *queue,

0 commit comments

Comments
 (0)