nvme: nvme_identify_ns_descs: prevent oob
PATCH v4 1/1 nvme: nvme_identify_ns_descs: prevent oob
Broken or malicious controller can send invalid ns id. Out-of-band memory access may occur if remaining buffer size is less than .nidl (ns id length) field of struct nvme_ns_id_desc
Fix this issue by checking (header size + .nidl) against remaining buffer length.
---v1->v2:
* Simplification: do not touch nvme_process_ns_desc()
* Update commit descriptionv2->v3:
* Even more simplification
* Replace while with do-while as first pre-loop condition check is pointless
* Change pos type: int -> size_t
* Update commit descriptionv3->v4:
* Replace do-while with for. A bit exceeded 80 hard limit but still in 100 soft limit
* Restore pos type. This is subject of another patch if we prefer minimalism
--- drivers/nvme/host/core.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/nvme/host/core.c +6 -2
@@ -1540,6 +1540,7 @@ static int nvme_identify_ns_descs(struct nvme_ctrl *ctrl,bool csi_seen = false;int status, pos, len;void *data; +struct nvme_ns_id_desc *cur;if (ctrl->vs <NVME_VS (1 ,3 ,0 ) && !nvme_multi_css (ctrl))return 0 ;
@@ -1563,11 +1564,14 @@ static int nvme_identify_ns_descs(struct nvme_ctrl *ctrl, goto free_data; } -for (pos =0 ; pos <NVME_IDENTIFY_DATA_SIZE ; pos += len) { -struct nvme_ns_id_desc *cur = data + pos; +for (pos =0 ; pos <NVME_IDENTIFY_DATA_SIZE -sizeof (*cur); pos += len) { + cur = data + pos;if (cur->nidl ==0 )break ; +/* check ns id desc does not exceed remaining buffer by size */ +if (cur->nidl +sizeof (*cur) >NVME_IDENTIFY_DATA_SIZE - pos) +break ; len =nvme_process_ns_desc (ctrl, &info->ids, cur, &csi_seen);if (len <0 )
Signature · 1 line
2.47.3
Christoph Hellwig
maintainerdrivers/nvme/host/core.c static int nvme_identify_ns_descs(struct nvme_ctrl *ctrl, · line 1567
Quoted 7 lines · Eugene Korenevsky
drivers/nvme/host/core.c +1
-2@@ -1563,11 +1564,14 @@ static int nvme_identify_ns_descs(struct nvme_ctrl *ctrl, goto free_data; } -for (pos =0 ; pos <NVME_IDENTIFY_DATA_SIZE ; pos += len) { -struct nvme_ns_id_desc *cur = data + pos; +for (pos =0 ; pos <NVME_IDENTIFY_DATA_SIZE -sizeof (*cur); pos += len) {
Please avoid the overly long line.
Otherwise this looks fine.
Quoted 6 lines · Eugene Korenevsky
Broken or malicious controller can send invalid ns id. Out-of-band memory access may occur if remaining buffer size is less than .nidl (ns id length) field of
struct nvme_ns_id_descFix this issue by checking (header size + .nidl) against remaining buffer length.
Thanks, applied to nvme-6.19 with the line length wrap fixed up.