nvmet/tcp: Solve coredump issue while initiator sends write CapsuleCmd
Subsystems (2)
PATCH 1/1 nvmet/tcp: Solve coredump issue while initiator sends write CapsuleCmd
When the initiator sneds write CapsuleCmd without incapsuledata, we can use the queue->connect command to handle. If we do not do that, we will have a coredump because queue->cmds are not initialized.
--- drivers/nvme/target/tcp.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/nvme/target/tcp.c +5 -1
@@ -866,7 +866,11 @@ static int nvmet_tcp_handle_h2c_data_pdu(struct nvmet_tcp_queue *queue)struct nvme_tcp_data_pdu *data = &queue->pdu.data;struct nvmet_tcp_cmd *cmd; - cmd = &queue->cmds[data->ttag]; +if (likely (queue->nr_cmds)) { + cmd = &queue->cmds[data->ttag]; + }else { + cmd = &queue->connect; + }if (le32_to_cpu (data->data_offset) != cmd->rbytes_done) { pr_err("ttag %u unexpected data offset %u (expected %u)\n",
Signature · 7 lines
2.21.3 _______________________________________________ Linux-nvme mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-nvme
Sagi Grimberg
maintainerHey Ziye,
Quoted 1 line
When the initiator sneds write CapsuleCmd without incapsuledata, we
sends in-capsule data
Quoted 2 lines
can use the
queue->connectcommand to handle. If we do not do that, we will have a coredump becausequeue->cmdsare not initialized.
This issue is specific to the I/O queue connect where the payload comes solicited via r2t.
I suggest to document the change log to the following:
nvmet-tcp: Fix NULL dereference when a connect data comes in h2cdata pdu
When handling commands without in-capsule data, we assign the ttag assuming we already have the queue commands array allocated (based on the queue size information in the connect data payload).
However if the connect itself did not send the connect data in-capsule we have yet to allocate the queue commands, and we will assign a bogus ttag and suffer a NULL dereference when we receive the corresponding h2cdata pdu.
Fix this by checking if we already allocated commands before dereferencing it when handling h2cdata, if we didn't, its for sure a connect and we should use the preallocated connect command.
Quoted 10 lines
Signed-off-by Ziye Yang <[email protected]>--- drivers/nvme/target/tcp.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)drivers/nvme/target/tcp.c +0
-0
drivers/nvme/target/tcp.c static int nvmet_tcp_handle_h2c_data_pdu(struct nvmet_tcp_queue *queue) · line 873
Quoted 9 lines
drivers/nvme/target/tcp.c +5
-1@@ -866,7 +866,11 @@ static int nvmet_tcp_handle_h2c_data_pdu(struct nvmet_tcp_queue *queue)struct nvme_tcp_data_pdu *data = &queue->pdu.data;struct nvmet_tcp_cmd *cmd; - cmd = &queue->cmds[data->ttag]; +if (likely (queue->nr_cmds)) { + cmd = &queue->cmds[data->ttag]; + }else { + cmd = &queue->connect; + }
No need for brackets on one-liner conditionals.
Also, I think it'd make sense to set the ttag to 0xffff if we hit this condition, otherwise we are sending a bogus ttag.
Something like:
--
drivers/nvme/target/tcp.c +4 -1
@@ -159,6 +159,10 @@ static void nvmet_tcp_finish_cmd(struct nvmet_tcp_cmd *cmd);static inline u16 nvmet_tcp_cmd_tag (struct nvmet_tcp_queue *queue,struct nvmet_tcp_cmd *cmd) { +if (unlikely (cmd == queue->connect)) { +/* We didn't allocate cmds yet, send 0xffff */ +return USHRT_MAX ; + }return cmd - queue->cmds; } --
_______________________________________________
Linux-nvme mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-nvme
Hi Sagi,
No problem. Let me revise the comments and use your commit message instead.
Best Regards
Ziye Yang
-----Original Message-----
From: Sagi Grimberg <[email protected]>
Sent: Friday, August 21, 2020 1:58 PM
To: Yang, Ziye <[email protected]>; [email protected]
Subject: Re: [PATCH] nvmet/tcp: Solve coredump issue while initiator sends write CapsuleCmd
Hey Ziye,
Quoted 1 line
When the initiator sneds write CapsuleCmd without incapsuledata, we
sends in-capsule data
Quoted 2 lines
can use the
queue->connectcommand to handle. If we do not do that, we will have a coredump becausequeue->cmdsare not initialized.
This issue is specific to the I/O queue connect where the payload comes solicited via r2t.
I suggest to document the change log to the following:
nvmet-tcp: Fix NULL dereference when a connect data comes in h2cdata pdu
When handling commands without in-capsule data, we assign the ttag assuming we already have the queue commands array allocated (based on the queue size information in the connect data payload).
However if the connect itself did not send the connect data in-capsule we have yet to allocate the queue commands, and we will assign a bogus ttag and suffer a NULL dereference when we receive the corresponding h2cdata pdu.
Fix this by checking if we already allocated commands before dereferencing it when handling h2cdata, if we didn't, its for sure a connect and we should use the preallocated connect command.
Quoted 10 lines
Signed-off-by Ziye Yang <[email protected]>--- drivers/nvme/target/tcp.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)drivers/nvme/target/tcp.c +0
-0
drivers/nvme/target/tcp.c static int nvmet_tcp_handle_h2c_data_pdu(struct nvmet_tcp_queue *queue) · line 873
Quoted 9 lines
drivers/nvme/target/tcp.c +5
-1@@ -866,7 +866,11 @@ static int nvmet_tcp_handle_h2c_data_pdu(struct nvmet_tcp_queue *queue)struct nvme_tcp_data_pdu *data = &queue->pdu.data;struct nvmet_tcp_cmd *cmd; - cmd = &queue->cmds[data->ttag]; +if (likely (queue->nr_cmds)) { + cmd = &queue->cmds[data->ttag]; + }else { + cmd = &queue->connect; + }
No need for brackets on one-liner conditionals.
Also, I think it'd make sense to set the ttag to 0xffff if we hit this condition, otherwise we are sending a bogus ttag.
Something like:
--
drivers/nvme/target/tcp.c +4 -1
@@ -159,6 +159,10 @@ static void nvmet_tcp_finish_cmd(struct nvmet_tcp_cmd *cmd);static inline u16 nvmet_tcp_cmd_tag (struct nvmet_tcp_queue *queue,struct nvmet_tcp_cmd *cmd) { +if (unlikely (cmd == queue->connect)) { +/* We didn't allocate cmds yet, send 0xffff */ +return USHRT_MAX ; + }return cmd - queue->cmds; } --
_______________________________________________
Linux-nvme mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-nvme