Commit 9a1fc0d8 authored by Khazhismel Kumykov's avatar Khazhismel Kumykov Committed by Zheng Zengkai
Browse files

block/compat_ioctl: fix range check in BLKGETSIZE 

stable inclusion
from stable-v5.10.113
commit 8bedbc8f7f35f533000b347644b6bf1f62524676
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I5ISAH

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=8bedbc8f7f35f533000b347644b6bf1f62524676



--------------------------------

commit ccf16413 upstream.

kernel ulong and compat_ulong_t may not be same width. Use type directly
to eliminate mismatches.

This would result in truncation rather than EFBIG for 32bit mode for
large disks.

Reviewed-by: default avatarBart Van Assche <bvanassche@acm.org>
Signed-off-by: default avatarKhazhismel Kumykov <khazhy@google.com>
Reviewed-by: default avatarChaitanya Kulkarni <kch@nvidia.com>
Link: https://lore.kernel.org/r/20220414224056.2875681-1-khazhy@google.com


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
Acked-by: default avatarXie XiuQi <xiexiuqi@huawei.com>
parent dd76b5fe

block/ioctl.c

+1 −1
Original line number Diff line number Diff line
@@ -683,7 +683,7 @@ long compat_blkdev_ioctl(struct file *file, unsigned cmd, unsigned long arg) 
			       (bdev->bd_bdi->ra_pages * PAGE_SIZE) / 512);

	case BLKGETSIZE:

		size = i_size_read(bdev->bd_inode);

		if ((size >> 9) > ~0UL)

		if ((size >> 9) > ~(compat_ulong_t)0)

			return -EFBIG;

		return compat_put_ulong(argp, size >> 9);