nvmet: nul-terminate the NQNs passed in the connect command
Subsystems (2)
Christoph Hellwig
maintainerPATCH 1/1 nvmet: nul-terminate the NQNs passed in the connect command
The host and subsystem NQNs are passed in the connect command payload and interpreted as nul-terminated strings. Ensure they actually are nul-terminated before using them.
--- drivers/nvme/target/fabrics-cmd.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/nvme/target/fabrics-cmd.c +4 -0
@@ -244,6 +244,8 @@ static void nvmet_execute_admin_connect(struct nvmet_req *req) goto out; } + d->subsysnqn[NVMF_NQN_FIELD_LEN ] ='\0' ; + d->hostnqn[NVMF_NQN_FIELD_LEN ] ='\0' ; status =nvmet_alloc_ctrl (d->subsysnqn, d->hostnqn, req,le32_to_cpu (c->kato), &ctrl);if (status)
@@ -313,6 +315,8 @@ static void nvmet_execute_io_connect(struct nvmet_req *req) goto out; } + d->subsysnqn[NVMF_NQN_FIELD_LEN ] ='\0' ; + d->hostnqn[NVMF_NQN_FIELD_LEN ] ='\0' ; ctrl =nvmet_ctrl_find_get (d->subsysnqn, d->hostnqn,le16_to_cpu (d->cntlid), req);if (!ctrl) {
Signature · 1 line
2.39.2
Won't this overrun the subsysnqn and hostnqn fields? Writing to subsysnqn[NVMF_NQN_FIELD_LEN] will clobber the first char of hostnqn:
struct nvmf_connect_data {
uuid_t hostid;
__le16 cntlid;
char resv4[238];
char subsysnqn[NVMF_NQN_FIELD_LEN];
char hostnqn[NVMF_NQN_FIELD_LEN];
char resv5[256];
};I think clearing the previous byte (index NVMF_NQN_FIELD_LEN - 1) would work. The spec requires NQNs to be under 223 bytes anyways, so they should never take up the whole field.
Quoted 38 lines · Christoph Hellwig
The host and subsystem NQNs are passed in the connect command payload and interpreted as nul-terminated strings. Ensure they actually are nul-terminated before using them.
Fixes a07b4970f464 "nvmet: add a generic NVMe target")Reported-by Alon Zahavi <[email protected]>Signed-off-by Christoph Hellwig <[email protected]>--- drivers/nvme/target/fabrics-cmd.c | 4 ++++ 1 file changed, 4 insertions(+)drivers/nvme/target/fabrics-cmd.c +4
-1@@ -244,6 +244,8 @@ static void nvmet_execute_admin_connect(struct nvmet_req *req) goto out; } + d->subsysnqn[NVMF_NQN_FIELD_LEN ] ='\0' ; + d->hostnqn[NVMF_NQN_FIELD_LEN ] ='\0' ; status =nvmet_alloc_ctrl (d->subsysnqn, d->hostnqn, req,le32_to_cpu (c->kato), &ctrl);if (status)@@ -313,6 +315,8 @@ static void nvmet_execute_io_connect(struct nvmet_req *req) goto out; } + d->subsysnqn[NVMF_NQN_FIELD_LEN ] ='\0' ; + d->hostnqn[NVMF_NQN_FIELD_LEN ] ='\0' ; ctrl =nvmet_ctrl_find_get (d->subsysnqn, d->hostnqn,le16_to_cpu (d->cntlid), req);if (!ctrl) { --2.39.2
Quoted 12 lines · Caleb Sander
Won't this overrun the subsysnqn and hostnqn fields? Writing to subsysnqn[NVMF_NQN_FIELD_LEN] will clobber the first char of hostnqn:
struct nvmf_connect_data { uuid_t hostid; __le16 cntlid; char resv4[238]; char subsysnqn[NVMF_NQN_FIELD_LEN]; char hostnqn[NVMF_NQN_FIELD_LEN]; char resv5[256]; };
Quoted 4 lines
I think clearing the previous byte (index
NVMF_NQN_FIELD_LEN- 1) would work. The spec requires NQNs to be under 223 bytes anyways, so they should never take up the whole field.
True.
We should zero the byte in the NVMF_NQN_SIZE index, making the fields their real size.
Changing the patch from d->subsysnqn[NVMF_NQN_FIELD_LEN] = '\0'; to d->subsysnqn[NVMF_NQN_SIZE] = '\0';
Quoted 39 lines · Christoph Hellwig
Quoted 38 lines
The host and subsystem NQNs are passed in the connect command payload and interpreted as nul-terminated strings. Ensure they actually are nul-terminated before using them.
Fixes a07b4970f464 "nvmet: add a generic NVMe target")Reported-by Alon Zahavi <[email protected]>Signed-off-by Christoph Hellwig <[email protected]>--- drivers/nvme/target/fabrics-cmd.c | 4 ++++ 1 file changed, 4 insertions(+)drivers/nvme/target/fabrics-cmd.c +4
-1@@ -244,6 +244,8 @@ static void nvmet_execute_admin_connect(struct nvmet_req *req) goto out; } + d->subsysnqn[NVMF_NQN_FIELD_LEN ] ='\0' ; + d->hostnqn[NVMF_NQN_FIELD_LEN ] ='\0' ; status =nvmet_alloc_ctrl (d->subsysnqn, d->hostnqn, req,le32_to_cpu (c->kato), &ctrl);if (status)@@ -313,6 +315,8 @@ static void nvmet_execute_io_connect(struct nvmet_req *req) goto out; } + d->subsysnqn[NVMF_NQN_FIELD_LEN ] ='\0' ; + d->hostnqn[NVMF_NQN_FIELD_LEN ] ='\0' ; ctrl =nvmet_ctrl_find_get (d->subsysnqn, d->hostnqn,le16_to_cpu (d->cntlid), req);if (!ctrl) { --2.39.2