From: Eugene Korenevsky <ekorenevsky@aliyun.com>
To: Keith Busch <kbusch@kernel.org>, Jens Axboe <axboe@kernel.dk>,
Christoph Hellwig <hch@lst.de>, Sagi Grimberg <sagi@grimberg.me>,
linux-nvme@lists.infradead.org, linux-kernel@vger.kernel.org
Subject: [PATCH v4] nvme: nvme_identify_ns_descs: prevent oob
Date: Tue, 2 Dec 2025 21:22:13 +0300 [thread overview]
Message-ID: <aS8uVVBz_n4lI3bM@localhost.localdomain> (raw)
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.
Signed-off-by: Eugene Korenevsky <ekorenevsky@aliyun.com>
---
v1->v2:
* Simplification: do not touch nvme_process_ns_desc()
* Update commit description
v2->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 description
v3->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(-)
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index f1f719351f3f..253d35937f03 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -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)
--
2.47.3
next reply other threads:[~2025-12-02 18:22 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-12-02 18:22 Eugene Korenevsky [this message]
2025-12-03 6:10 ` [PATCH v4] nvme: nvme_identify_ns_descs: prevent oob Christoph Hellwig
2025-12-04 16:09 ` Keith Busch
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=aS8uVVBz_n4lI3bM@localhost.localdomain \
--to=ekorenevsky@aliyun.com \
--cc=axboe@kernel.dk \
--cc=hch@lst.de \
--cc=kbusch@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nvme@lists.infradead.org \
--cc=sagi@grimberg.me \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.