Skip to contentSkip to conversation

nvme/tcp: release socket on sock_alloc_file() failure

PATCH In review Wilfred Mallawa 4 participants 4 messages May 12 – May 15 NVMe

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 nvme/tcp: release socket on sock_alloc_file() failure

From: Wilfred Mallawa <[email protected]>

If sock_alloc_file() fails after a sock_create_kern() in nvme_tcp_alloc_queue(), the socket is not released.

Add sock_release() to release the socket if sock_alloc_file() fails.

Fixes e40d4eb84089eae1 ("nvme-tcp: allocate socket file")
---
 drivers/nvme/host/tcp.c | 2 ++
 1 file changed, 2 insertions(+)
drivers/nvme/host/tcp.c +2 -0
index 8e5421d2e8b9..f4b9d8acc7b1 100644
@@ -1820,6 +1820,8 @@ static int nvme_tcp_alloc_queue(struct nvme_ctrl *nctrl, int qid,
 	sock_file = sock_alloc_file(queue->sock, O_CLOEXEC, NULL);
 	if (IS_ERR(sock_file)) {
 		ret = PTR_ERR(sock_file);
+		sock_release(queue->sock);
+		queue->sock = NULL;
 		goto err_destroy_mutex;
 	}
 
Signature · 1 line
2.54.0
Reviewed-by on v1 1/1
#1 lore raw
Quoted 5 lines · Wilfred Mallawa

From: Wilfred Mallawa <[email protected]>

If sock_alloc_file() fails after a sock_create_kern() in nvme_tcp_alloc_queue(), the socket is not released.

Quoted 8 lines

Add sock_release() to release the socket if sock_alloc_file() fails.

Fixes e40d4eb84089eae1 ("nvme-tcp: allocate socket file")
---
  drivers/nvme/host/tcp.c | 2 ++
  1 file changed, 2 insertions(+)

Cheers,

Hannes

Signature · 4 lines
Dr. Hannes Reinecke                  Kernel Storage Architect
[email protected]                                +49 911 74053 688
SUSE Software Solutions GmbH, Frankenstr. 146, 90461 Nürnberg
HRB 36809 (AG Nürnberg), GF: I. Totev, A. McDonald, W. Knoblich