diff mbox series

[5.15.y,V2] block: use "unsigned long" for blk_validate_block_size().

Message ID 20240819002324.2284362-1-david.hunter.linux@gmail.com (mailing list archive)
State New
Headers show
Series [5.15.y,V2] block: use "unsigned long" for blk_validate_block_size(). | expand

Commit Message

David Hunter Aug. 19, 2024, 12:23 a.m. UTC 
From: Tetsuo Handa <penguin-kernel@i-love.sakura.ne.jp>

[ Upstream commit 37ae5a0f5287a52cf51242e76ccf198d02ffe495]

Since lo_simple_ioctl(LOOP_SET_BLOCK_SIZE) and ioctl(NBD_SET_BLKSIZE) pass
user-controlled "unsigned long arg" to blk_validate_block_size(),
"unsigned long" should be used for validation.

Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/9ecbf057-4375-c2db-ab53-e4cc0dff953d@i-love.sakura.ne.jp
Signed-off-by: Jens Axboe <axboe@kernel.dk>
(cherry picked from commit 37ae5a0f5287a52cf51242e76ccf198d02ffe495)
Signed-off-by: David Hunter <david.hunter.linux@gmail.com>
---
V1 --> V2
	- put upstream commit after subject 
	- put the original Author
	- Added a few people I needed to CC
---
 include/linux/blkdev.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 905844172cfd..c6d57814988d 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -235,7 +235,7 @@  struct request {
 	void *end_io_data;
 };
 
-static inline int blk_validate_block_size(unsigned int bsize)
+static inline int blk_validate_block_size(unsigned long bsize)
 {
 	if (bsize < 512 || bsize > PAGE_SIZE || !is_power_of_2(bsize))
 		return -EINVAL;