Skip to content

Commit a58383f

Browse files
deepanshu406axboe
authored andcommitted
block: add allocation size check in blkdev_pr_read_keys()
blkdev_pr_read_keys() takes num_keys from userspace and uses it to calculate the allocation size for keys_info via struct_size(). While there is a check for SIZE_MAX (integer overflow), there is no upper bound validation on the allocation size itself. A malicious or buggy userspace can pass a large num_keys value that doesn't trigger overflow but still results in an excessive allocation attempt, causing a warning in the page allocator when the order exceeds MAX_PAGE_ORDER. Fix this by introducing PR_KEYS_MAX to limit the number of keys to a sane value. This makes the SIZE_MAX check redundant, so remove it. Also switch to kvzalloc/kvfree to handle larger allocations gracefully. Fixes: 22a1ffe ("block: add IOC_PR_READ_KEYS ioctl") Tested-by: syzbot+660d079d90f8a1baf54d@syzkaller.appspotmail.com Reported-by: syzbot+660d079d90f8a1baf54d@syzkaller.appspotmail.com Closes: https://syzkaller.appspot.com/bug?extid=660d079d90f8a1baf54d Link: https://lore.kernel.org/all/20251212013510.3576091-1-kartikey406@gmail.com/T/ [v1] Signed-off-by: Deepanshu Kartikey <kartikey406@gmail.com> Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com> Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com> Signed-off-by: Jens Axboe <axboe@kernel.dk>
1 parent 67d85b0 commit a58383f

2 files changed

Lines changed: 7 additions & 4 deletions

File tree

block/ioctl.c

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -442,11 +442,12 @@ static int blkdev_pr_read_keys(struct block_device *bdev, blk_mode_t mode,
442442
if (copy_from_user(&read_keys, arg, sizeof(read_keys)))
443443
return -EFAULT;
444444

445-
keys_info_len = struct_size(keys_info, keys, read_keys.num_keys);
446-
if (keys_info_len == SIZE_MAX)
445+
if (read_keys.num_keys > PR_KEYS_MAX)
447446
return -EINVAL;
448447

449-
keys_info = kzalloc(keys_info_len, GFP_KERNEL);
448+
keys_info_len = struct_size(keys_info, keys, read_keys.num_keys);
449+
450+
keys_info = kvzalloc(keys_info_len, GFP_KERNEL);
450451
if (!keys_info)
451452
return -ENOMEM;
452453

@@ -473,7 +474,7 @@ static int blkdev_pr_read_keys(struct block_device *bdev, blk_mode_t mode,
473474
if (copy_to_user(arg, &read_keys, sizeof(read_keys)))
474475
ret = -EFAULT;
475476
out:
476-
kfree(keys_info);
477+
kvfree(keys_info);
477478
return ret;
478479
}
479480

include/uapi/linux/pr.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,4 +79,6 @@ struct pr_read_reservation {
7979
#define IOC_PR_READ_KEYS _IOWR('p', 206, struct pr_read_keys)
8080
#define IOC_PR_READ_RESERVATION _IOR('p', 207, struct pr_read_reservation)
8181

82+
#define PR_KEYS_MAX (1u << 16)
83+
8284
#endif /* _UAPI_PR_H */

0 commit comments

Comments
 (0)