Skip to content

Commit 38ec846

Browse files
stefanhaRHaxboe
authored andcommitted
nvme: reject invalid pr_read_keys() num_keys values
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>
1 parent ab4fb1d commit 38ec846

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
@@ -228,7 +228,8 @@ static int nvme_pr_resv_report(struct block_device *bdev, void *data,
228228
static int nvme_pr_read_keys(struct block_device *bdev,
229229
struct pr_keys *keys_info)
230230
{
231-
u32 rse_len, num_keys = keys_info->num_keys;
231+
size_t rse_len;
232+
u32 num_keys = keys_info->num_keys;
232233
struct nvme_reservation_status_ext *rse;
233234
int ret, i;
234235
bool eds;
@@ -238,6 +239,9 @@ static int nvme_pr_read_keys(struct block_device *bdev,
238239
* enough to get enough keys to fill the return keys buffer.
239240
*/
240241
rse_len = struct_size(rse, regctl_eds, num_keys);
242+
if (rse_len > U32_MAX)
243+
return -EINVAL;
244+
241245
rse = kzalloc(rse_len, GFP_KERNEL);
242246
if (!rse)
243247
return -ENOMEM;

0 commit comments

Comments
 (0)