Skip to content

Commit 975c494

Browse files
stefanhaRHopsiff
authored andcommitted
nvme: reject invalid pr_read_keys() num_keys values
[ Upstream commit 38ec846 ] 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> Reviewed-by: Hannes Reinecke <hare@suse.de> Reviewed-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com> Signed-off-by: Jens Axboe <axboe@kernel.dk> Stable-dep-of: c332015 ("nvme: fix memory allocation in nvme_pr_read_keys()") Signed-off-by: Sasha Levin <sashal@kernel.org> (cherry picked from commit be3b61ebcafec7274cc3b190e8ee678f0d981378) Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
1 parent 0d8d654 commit 975c494

1 file changed

Lines changed: 5 additions & 1 deletion

File tree

  • drivers/nvme/host

drivers/nvme/host/pr.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,8 @@ static int nvme_pr_resv_report(struct block_device *bdev, void *data,
203203
static int nvme_pr_read_keys(struct block_device *bdev,
204204
struct pr_keys *keys_info)
205205
{
206-
u32 rse_len, num_keys = keys_info->num_keys;
206+
size_t rse_len;
207+
u32 num_keys = keys_info->num_keys;
207208
struct nvme_reservation_status_ext *rse;
208209
int ret, i;
209210
bool eds;
@@ -213,6 +214,9 @@ static int nvme_pr_read_keys(struct block_device *bdev,
213214
* enough to get enough keys to fill the return keys buffer.
214215
*/
215216
rse_len = struct_size(rse, regctl_eds, num_keys);
217+
if (rse_len > U32_MAX)
218+
return -EINVAL;
219+
216220
rse = kzalloc(rse_len, GFP_KERNEL);
217221
if (!rse)
218222
return -ENOMEM;

0 commit comments

Comments
 (0)