* [PATCH AUTOSEL 6.9 02/15] md: Fix overflow in is_mddev_idle [not found] <20240526094152.3412316-1-sashal@kernel.org> @ 2024-05-26 9:41 ` Sasha Levin 2024-05-27 1:08 ` Yu Kuai 2024-05-26 9:41 ` [PATCH AUTOSEL 6.9 15/15] block/ioctl: prefer different overflow check Sasha Levin 1 sibling, 1 reply; 4+ messages in thread From: Sasha Levin @ 2024-05-26 9:41 UTC (permalink / raw) To: linux-kernel, stable Cc: Li Nan, Yu Kuai, Song Liu, Sasha Levin, axboe, linux-raid, linux-block From: Li Nan <linan122@huawei.com> [ Upstream commit 3f9f231236ce7e48780d8a4f1f8cb9fae2df1e4e ] UBSAN reports this problem: UBSAN: Undefined behaviour in drivers/md/md.c:8175:15 signed integer overflow: -2147483291 - 2072033152 cannot be represented in type 'int' Call trace: dump_backtrace+0x0/0x310 show_stack+0x28/0x38 dump_stack+0xec/0x15c ubsan_epilogue+0x18/0x84 handle_overflow+0x14c/0x19c __ubsan_handle_sub_overflow+0x34/0x44 is_mddev_idle+0x338/0x3d8 md_do_sync+0x1bb8/0x1cf8 md_thread+0x220/0x288 kthread+0x1d8/0x1e0 ret_from_fork+0x10/0x18 'curr_events' will overflow when stat accum or 'sync_io' is greater than INT_MAX. Fix it by changing sync_io, last_events and curr_events to 64bit. Signed-off-by: Li Nan <linan122@huawei.com> Reviewed-by: Yu Kuai <yukuai3@huawei.com> Link: https://lore.kernel.org/r/20240117031946.2324519-2-linan666@huaweicloud.com Signed-off-by: Song Liu <song@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org> --- drivers/md/md.c | 7 ++++--- drivers/md/md.h | 4 ++-- include/linux/blkdev.h | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/drivers/md/md.c b/drivers/md/md.c index e575e74aabf5e..c88b50a4be82f 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -8576,14 +8576,15 @@ static int is_mddev_idle(struct mddev *mddev, int init) { struct md_rdev *rdev; int idle; - int curr_events; + long long curr_events; idle = 1; rcu_read_lock(); rdev_for_each_rcu(rdev, mddev) { struct gendisk *disk = rdev->bdev->bd_disk; - curr_events = (int)part_stat_read_accum(disk->part0, sectors) - - atomic_read(&disk->sync_io); + curr_events = + (long long)part_stat_read_accum(disk->part0, sectors) - + atomic64_read(&disk->sync_io); /* sync IO will cause sync_io to increase before the disk_stats * as sync_io is counted when a request starts, and * disk_stats is counted when it completes. diff --git a/drivers/md/md.h b/drivers/md/md.h index 097d9dbd69b83..d0db98c0d33be 100644 --- a/drivers/md/md.h +++ b/drivers/md/md.h @@ -51,7 +51,7 @@ struct md_rdev { sector_t sectors; /* Device size (in 512bytes sectors) */ struct mddev *mddev; /* RAID array if running */ - int last_events; /* IO event timestamp */ + long long last_events; /* IO event timestamp */ /* * If meta_bdev is non-NULL, it means that a separate device is @@ -621,7 +621,7 @@ extern void mddev_unlock(struct mddev *mddev); static inline void md_sync_acct(struct block_device *bdev, unsigned long nr_sectors) { - atomic_add(nr_sectors, &bdev->bd_disk->sync_io); + atomic64_add(nr_sectors, &bdev->bd_disk->sync_io); } static inline void md_sync_acct_bio(struct bio *bio, unsigned long nr_sectors) diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 69e7da33ca49a..f10fb01a629fb 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -174,7 +174,7 @@ struct gendisk { struct list_head slave_bdevs; #endif struct timer_rand_state *random; - atomic_t sync_io; /* RAID */ + atomic64_t sync_io; /* RAID */ struct disk_events *ev; #ifdef CONFIG_BLK_DEV_ZONED -- 2.43.0 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH AUTOSEL 6.9 02/15] md: Fix overflow in is_mddev_idle 2024-05-26 9:41 ` [PATCH AUTOSEL 6.9 02/15] md: Fix overflow in is_mddev_idle Sasha Levin @ 2024-05-27 1:08 ` Yu Kuai 2024-06-19 14:27 ` Sasha Levin 0 siblings, 1 reply; 4+ messages in thread From: Yu Kuai @ 2024-05-27 1:08 UTC (permalink / raw) To: Sasha Levin, linux-kernel, stable Cc: Li Nan, Song Liu, axboe, linux-raid, linux-block Hi, 在 2024/05/26 17:41, Sasha Levin 写道: > From: Li Nan <linan122@huawei.com> > > [ Upstream commit 3f9f231236ce7e48780d8a4f1f8cb9fae2df1e4e ] > > UBSAN reports this problem: > > UBSAN: Undefined behaviour in drivers/md/md.c:8175:15 > signed integer overflow: > -2147483291 - 2072033152 cannot be represented in type 'int' > Call trace: > dump_backtrace+0x0/0x310 > show_stack+0x28/0x38 > dump_stack+0xec/0x15c > ubsan_epilogue+0x18/0x84 > handle_overflow+0x14c/0x19c > __ubsan_handle_sub_overflow+0x34/0x44 > is_mddev_idle+0x338/0x3d8 > md_do_sync+0x1bb8/0x1cf8 > md_thread+0x220/0x288 > kthread+0x1d8/0x1e0 > ret_from_fork+0x10/0x18 > > 'curr_events' will overflow when stat accum or 'sync_io' is greater than > INT_MAX. > > Fix it by changing sync_io, last_events and curr_events to 64bit. > > Signed-off-by: Li Nan <linan122@huawei.com> > Reviewed-by: Yu Kuai <yukuai3@huawei.com> > Link: https://lore.kernel.org/r/20240117031946.2324519-2-linan666@huaweicloud.com > Signed-off-by: Song Liu <song@kernel.org> > Signed-off-by: Sasha Levin <sashal@kernel.org> Hi, please notice that this patch doesn't fix real issue expect for the ubsan warning, and this patch is reverted: > --- > drivers/md/md.c | 7 ++++--- > drivers/md/md.h | 4 ++-- > include/linux/blkdev.h | 2 +- > 3 files changed, 7 insertions(+), 6 deletions(-) > > diff --git a/drivers/md/md.c b/drivers/md/md.c > index e575e74aabf5e..c88b50a4be82f 100644 > --- a/drivers/md/md.c > +++ b/drivers/md/md.c > @@ -8576,14 +8576,15 @@ static int is_mddev_idle(struct mddev *mddev, int init) > { > struct md_rdev *rdev; > int idle; > - int curr_events; > + long long curr_events; > > idle = 1; > rcu_read_lock(); > rdev_for_each_rcu(rdev, mddev) { > struct gendisk *disk = rdev->bdev->bd_disk; > - curr_events = (int)part_stat_read_accum(disk->part0, sectors) - > - atomic_read(&disk->sync_io); > + curr_events = > + (long long)part_stat_read_accum(disk->part0, sectors) - > + atomic64_read(&disk->sync_io); > /* sync IO will cause sync_io to increase before the disk_stats > * as sync_io is counted when a request starts, and > * disk_stats is counted when it completes. > diff --git a/drivers/md/md.h b/drivers/md/md.h > index 097d9dbd69b83..d0db98c0d33be 100644 > --- a/drivers/md/md.h > +++ b/drivers/md/md.h > @@ -51,7 +51,7 @@ struct md_rdev { > > sector_t sectors; /* Device size (in 512bytes sectors) */ > struct mddev *mddev; /* RAID array if running */ > - int last_events; /* IO event timestamp */ > + long long last_events; /* IO event timestamp */ > > /* > * If meta_bdev is non-NULL, it means that a separate device is > @@ -621,7 +621,7 @@ extern void mddev_unlock(struct mddev *mddev); > > static inline void md_sync_acct(struct block_device *bdev, unsigned long nr_sectors) > { > - atomic_add(nr_sectors, &bdev->bd_disk->sync_io); > + atomic64_add(nr_sectors, &bdev->bd_disk->sync_io); > } > > static inline void md_sync_acct_bio(struct bio *bio, unsigned long nr_sectors) > diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h > index 69e7da33ca49a..f10fb01a629fb 100644 > --- a/include/linux/blkdev.h > +++ b/include/linux/blkdev.h > @@ -174,7 +174,7 @@ struct gendisk { > struct list_head slave_bdevs; > #endif > struct timer_rand_state *random; > - atomic_t sync_io; /* RAID */ > + atomic64_t sync_io; /* RAID */ > struct disk_events *ev; > > #ifdef CONFIG_BLK_DEV_ZONED > ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH AUTOSEL 6.9 02/15] md: Fix overflow in is_mddev_idle 2024-05-27 1:08 ` Yu Kuai @ 2024-06-19 14:27 ` Sasha Levin 0 siblings, 0 replies; 4+ messages in thread From: Sasha Levin @ 2024-06-19 14:27 UTC (permalink / raw) To: Yu Kuai Cc: linux-kernel, stable, Li Nan, Song Liu, axboe, linux-raid, linux-block On Mon, May 27, 2024 at 09:08:27AM +0800, Yu Kuai wrote: >Hi, > >在 2024/05/26 17:41, Sasha Levin 写道: >>From: Li Nan <linan122@huawei.com> >> >>[ Upstream commit 3f9f231236ce7e48780d8a4f1f8cb9fae2df1e4e ] >> >>UBSAN reports this problem: >> >> UBSAN: Undefined behaviour in drivers/md/md.c:8175:15 >> signed integer overflow: >> -2147483291 - 2072033152 cannot be represented in type 'int' >> Call trace: >> dump_backtrace+0x0/0x310 >> show_stack+0x28/0x38 >> dump_stack+0xec/0x15c >> ubsan_epilogue+0x18/0x84 >> handle_overflow+0x14c/0x19c >> __ubsan_handle_sub_overflow+0x34/0x44 >> is_mddev_idle+0x338/0x3d8 >> md_do_sync+0x1bb8/0x1cf8 >> md_thread+0x220/0x288 >> kthread+0x1d8/0x1e0 >> ret_from_fork+0x10/0x18 >> >>'curr_events' will overflow when stat accum or 'sync_io' is greater than >>INT_MAX. >> >>Fix it by changing sync_io, last_events and curr_events to 64bit. >> >>Signed-off-by: Li Nan <linan122@huawei.com> >>Reviewed-by: Yu Kuai <yukuai3@huawei.com> >>Link: https://lore.kernel.org/r/20240117031946.2324519-2-linan666@huaweicloud.com >>Signed-off-by: Song Liu <song@kernel.org> >>Signed-off-by: Sasha Levin <sashal@kernel.org> > >Hi, please notice that this patch doesn't fix real issue expect for >the ubsan warning, and this patch is reverted: I'll drop it, thanks! -- Thanks, Sasha ^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH AUTOSEL 6.9 15/15] block/ioctl: prefer different overflow check [not found] <20240526094152.3412316-1-sashal@kernel.org> 2024-05-26 9:41 ` [PATCH AUTOSEL 6.9 02/15] md: Fix overflow in is_mddev_idle Sasha Levin @ 2024-05-26 9:41 ` Sasha Levin 1 sibling, 0 replies; 4+ messages in thread From: Sasha Levin @ 2024-05-26 9:41 UTC (permalink / raw) To: linux-kernel, stable Cc: Justin Stitt, Christoph Hellwig, Jens Axboe, Sasha Levin, nathan, linux-block, llvm From: Justin Stitt <justinstitt@google.com> [ Upstream commit ccb326b5f9e623eb7f130fbbf2505ec0e2dcaff9 ] Running syzkaller with the newly reintroduced signed integer overflow sanitizer shows this report: [ 62.982337] ------------[ cut here ]------------ [ 62.985692] cgroup: Invalid name [ 62.986211] UBSAN: signed-integer-overflow in ../block/ioctl.c:36:46 [ 62.989370] 9pnet_fd: p9_fd_create_tcp (7343): problem connecting socket to 127.0.0.1 [ 62.992992] 9223372036854775807 + 4095 cannot be represented in type 'long long' [ 62.997827] 9pnet_fd: p9_fd_create_tcp (7345): problem connecting socket to 127.0.0.1 [ 62.999369] random: crng reseeded on system resumption [ 63.000634] GUP no longer grows the stack in syz-executor.2 (7353): 20002000-20003000 (20001000) [ 63.000668] CPU: 0 PID: 7353 Comm: syz-executor.2 Not tainted 6.8.0-rc2-00035-gb3ef86b5a957 #1 [ 63.000677] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.16.3-debian-1.16.3-2 04/01/2014 [ 63.000682] Call Trace: [ 63.000686] <TASK> [ 63.000731] dump_stack_lvl+0x93/0xd0 [ 63.000919] __get_user_pages+0x903/0xd30 [ 63.001030] __gup_longterm_locked+0x153e/0x1ba0 [ 63.001041] ? _raw_read_unlock_irqrestore+0x17/0x50 [ 63.001072] ? try_get_folio+0x29c/0x2d0 [ 63.001083] internal_get_user_pages_fast+0x1119/0x1530 [ 63.001109] iov_iter_extract_pages+0x23b/0x580 [ 63.001206] bio_iov_iter_get_pages+0x4de/0x1220 [ 63.001235] iomap_dio_bio_iter+0x9b6/0x1410 [ 63.001297] __iomap_dio_rw+0xab4/0x1810 [ 63.001316] iomap_dio_rw+0x45/0xa0 [ 63.001328] ext4_file_write_iter+0xdde/0x1390 [ 63.001372] vfs_write+0x599/0xbd0 [ 63.001394] ksys_write+0xc8/0x190 [ 63.001403] do_syscall_64+0xd4/0x1b0 [ 63.001421] ? arch_exit_to_user_mode_prepare+0x3a/0x60 [ 63.001479] entry_SYSCALL_64_after_hwframe+0x6f/0x77 [ 63.001535] RIP: 0033:0x7f7fd3ebf539 [ 63.001551] Code: 28 00 00 00 75 05 48 83 c4 28 c3 e8 f1 14 00 00 90 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 c7 c1 b8 ff ff ff f7 d8 64 89 01 48 [ 63.001562] RSP: 002b:00007f7fd32570c8 EFLAGS: 00000246 ORIG_RAX: 0000000000000001 [ 63.001584] RAX: ffffffffffffffda RBX: 00007f7fd3ff3f80 RCX: 00007f7fd3ebf539 [ 63.001590] RDX: 4db6d1e4f7e43360 RSI: 0000000020000000 RDI: 0000000000000004 [ 63.001595] RBP: 00007f7fd3f1e496 R08: 0000000000000000 R09: 0000000000000000 [ 63.001599] R10: 0000000000000000 R11: 0000000000000246 R12: 0000000000000000 [ 63.001604] R13: 0000000000000006 R14: 00007f7fd3ff3f80 R15: 00007ffd415ad2b8 ... [ 63.018142] ---[ end trace ]--- Historically, the signed integer overflow sanitizer did not work in the kernel due to its interaction with `-fwrapv` but this has since been changed [1] in the newest version of Clang; It was re-enabled in the kernel with Commit 557f8c582a9ba8ab ("ubsan: Reintroduce signed overflow sanitizer"). Let's rework this overflow checking logic to not actually perform an overflow during the check itself, thus avoiding the UBSAN splat. [1]: https://github.com/llvm/llvm-project/pull/82432 Signed-off-by: Justin Stitt <justinstitt@google.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Link: https://lore.kernel.org/r/20240507-b4-sio-block-ioctl-v3-1-ba0c2b32275e@google.com Signed-off-by: Jens Axboe <axboe@kernel.dk> Signed-off-by: Sasha Levin <sashal@kernel.org> --- block/ioctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/block/ioctl.c b/block/ioctl.c index f505f9c341eb0..2639ce9df3852 100644 --- a/block/ioctl.c +++ b/block/ioctl.c @@ -33,7 +33,7 @@ static int blkpg_do_ioctl(struct block_device *bdev, if (op == BLKPG_DEL_PARTITION) return bdev_del_partition(disk, p.pno); - if (p.start < 0 || p.length <= 0 || p.start + p.length < 0) + if (p.start < 0 || p.length <= 0 || LLONG_MAX - p.length < p.start) return -EINVAL; /* Check that the partition is aligned to the block size */ if (!IS_ALIGNED(p.start | p.length, bdev_logical_block_size(bdev))) -- 2.43.0 ^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-06-19 14:27 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20240526094152.3412316-1-sashal@kernel.org>
2024-05-26 9:41 ` [PATCH AUTOSEL 6.9 02/15] md: Fix overflow in is_mddev_idle Sasha Levin
2024-05-27 1:08 ` Yu Kuai
2024-06-19 14:27 ` Sasha Levin
2024-05-26 9:41 ` [PATCH AUTOSEL 6.9 15/15] block/ioctl: prefer different overflow check Sasha Levin
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox