From: Stefan Hajnoczi <stefanha@redhat.com>
To: linux-block@vger.kernel.org
Cc: "Martin K. Petersen" <martin.petersen@oracle.com>,
linux-kernel@vger.kernel.org,
"James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>,
Mike Christie <michael.christie@oracle.com>,
Jens Axboe <axboe@kernel.dk>,
linux-nvme@lists.infradead.org, Keith Busch <kbusch@kernel.org>,
Sagi Grimberg <sagi@grimberg.me>,
linux-scsi@vger.kernel.org, Christoph Hellwig <hch@lst.de>,
Stefan Hajnoczi <stefanha@redhat.com>
Subject: [PATCH 2/4] nvme: reject invalid pr_read_keys() num_keys values
Date: Wed, 26 Nov 2025 11:35:58 -0500 [thread overview]
Message-ID: <20251126163600.583036-3-stefanha@redhat.com> (raw)
In-Reply-To: <20251126163600.583036-1-stefanha@redhat.com>
The pr_read_keys() interface has a u32 num_keys parameter. The NVMe
Reservation Report command has a u32 maximum length. Reject num_keys
values that are too large to fit.
This will become important when pr_read_keys() is exposed to untrusted
userspace via an <linux/pr.h> ioctl.
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
drivers/nvme/host/pr.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/drivers/nvme/host/pr.c b/drivers/nvme/host/pr.c
index ca6a74607b139..476a0518a11ca 100644
--- a/drivers/nvme/host/pr.c
+++ b/drivers/nvme/host/pr.c
@@ -233,6 +233,11 @@ static int nvme_pr_read_keys(struct block_device *bdev,
int ret, i;
bool eds;
+ /* Check that keys fit into u32 rse_len */
+ if (num_keys > -(u32)offsetof(typeof(*rse), regctl_eds) /
+ sizeof(rse->regctl_eds[0]))
+ return -EINVAL;
+
/*
* Assume we are using 128-bit host IDs and allocate a buffer large
* enough to get enough keys to fill the return keys buffer.
--
2.52.0
next prev parent reply other threads:[~2025-11-26 16:36 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-11-26 16:35 [PATCH 0/4] block: add IOC_PR_READ_KEYS and IOC_PR_READ_RESERVATION ioctls Stefan Hajnoczi
2025-11-26 16:35 ` [PATCH 1/4] scsi: sd: reject invalid pr_read_keys() num_keys values Stefan Hajnoczi
2025-11-27 6:59 ` Hannes Reinecke
2025-11-26 16:35 ` Stefan Hajnoczi [this message]
2025-11-27 7:02 ` [PATCH 2/4] nvme: " Hannes Reinecke
2025-11-26 16:35 ` [PATCH 3/4] block: add IOC_PR_READ_KEYS ioctl Stefan Hajnoczi
2025-11-26 18:06 ` kernel test robot
2025-11-27 7:07 ` Hannes Reinecke
2025-11-29 14:32 ` Krzysztof Kozlowski
2025-12-01 15:06 ` Stefan Hajnoczi
2025-12-01 16:26 ` Krzysztof Kozlowski
2025-12-01 18:36 ` Stefan Hajnoczi
2025-12-01 15:14 ` Stefan Hajnoczi
2025-12-01 16:27 ` Krzysztof Kozlowski
2025-11-29 14:31 ` Krzysztof Kozlowski
2025-11-26 16:36 ` [PATCH 4/4] block: add IOC_PR_READ_RESERVATION ioctl Stefan Hajnoczi
2025-11-27 7:07 ` Hannes Reinecke
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=20251126163600.583036-3-stefanha@redhat.com \
--to=stefanha@redhat.com \
--cc=James.Bottomley@HansenPartnership.com \
--cc=axboe@kernel.dk \
--cc=hch@lst.de \
--cc=kbusch@kernel.org \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nvme@lists.infradead.org \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=michael.christie@oracle.com \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox