Skip to content

Commit 36446de

Browse files
ming1axboe
authored andcommitted
ublk: fix tautological comparison warning in ublk_ctrl_reg_buf
On 32-bit architectures, 'unsigned long size' can never exceed UBLK_SHMEM_BUF_SIZE_MAX (1ULL << 32), causing a tautological comparison warning. Validate buf_reg.len (__u64) directly before using it, and consolidate all input validation into a single check. Also remove the unnecessary local variables 'addr' and 'size' since buf_reg.addr and buf_reg.len can be used directly. Reported-by: kernel test robot <lkp@intel.com> Closes: https://lore.kernel.org/oe-kbuild-all/202604101952.3NOzqnu9-lkp@intel.com/ Fixes: 23b3b6f ("ublk: widen ublk_shmem_buf_reg.len to __u64 for 4GB buffer support") Signed-off-by: Ming Lei <tom.leiming@gmail.com> Link: https://patch.msgid.link/20260410124136.3983429-1-tom.leiming@gmail.com Signed-off-by: Jens Axboe <axboe@kernel.dk>
1 parent 0a42ca4 commit 36446de

1 file changed

Lines changed: 6 additions & 8 deletions

File tree

drivers/block/ublk_drv.c

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5330,7 +5330,7 @@ static int ublk_ctrl_reg_buf(struct ublk_device *ub,
53305330
{
53315331
void __user *argp = (void __user *)(unsigned long)header->addr;
53325332
struct ublk_shmem_buf_reg buf_reg;
5333-
unsigned long addr, size, nr_pages;
5333+
unsigned long nr_pages;
53345334
struct page **pages = NULL;
53355335
unsigned int gup_flags;
53365336
unsigned int memflags;
@@ -5352,14 +5352,12 @@ static int ublk_ctrl_reg_buf(struct ublk_device *ub,
53525352
if (buf_reg.reserved)
53535353
return -EINVAL;
53545354

5355-
addr = buf_reg.addr;
5356-
size = buf_reg.len;
5357-
nr_pages = size >> PAGE_SHIFT;
5358-
5359-
if (!size || size > UBLK_SHMEM_BUF_SIZE_MAX ||
5360-
!PAGE_ALIGNED(size) || !PAGE_ALIGNED(addr))
5355+
if (!buf_reg.len || buf_reg.len > UBLK_SHMEM_BUF_SIZE_MAX ||
5356+
!PAGE_ALIGNED(buf_reg.len) || !PAGE_ALIGNED(buf_reg.addr))
53615357
return -EINVAL;
53625358

5359+
nr_pages = buf_reg.len >> PAGE_SHIFT;
5360+
53635361
/* Pin pages before any locks (may sleep) */
53645362
pages = kvmalloc_array(nr_pages, sizeof(*pages), GFP_KERNEL);
53655363
if (!pages)
@@ -5369,7 +5367,7 @@ static int ublk_ctrl_reg_buf(struct ublk_device *ub,
53695367
if (!(buf_reg.flags & UBLK_SHMEM_BUF_READ_ONLY))
53705368
gup_flags |= FOLL_WRITE;
53715369

5372-
pinned = pin_user_pages_fast(addr, nr_pages, gup_flags, pages);
5370+
pinned = pin_user_pages_fast(buf_reg.addr, nr_pages, gup_flags, pages);
53735371
if (pinned < 0) {
53745372
ret = pinned;
53755373
goto err_free_pages;

0 commit comments

Comments
 (0)