Justin Stitt 3220c90f4d block/ioctl: prefer different overflow check ... [ 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>		2024-07-05 09:14:25 +02:00
..
partitions	block: Move checking GENHD_FL_NO_PART to bdev_add_partition()	2024-02-23 08:54:35 +01:00
Kconfig	SCSI misc on 20210902	2021-09-02 15:09:46 -07:00
Kconfig.iosched	Revert "block/mq-deadline: Add cgroup support"	2021-08-11 13:47:26 -06:00
Makefile	block: move CONFIG_BLOCK guard to top Makefile	2022-12-14 11:37:30 +01:00
badblocks.c	treewide: Use fallthrough pseudo-keyword	2020-08-23 17:36:59 -05:00
bdev.c	block: move GENHD_FL_BLOCK_EVENTS_ON_EXCL_WRITE to disk->event_flags	2023-09-19 12:23:02 +02:00
bfq-cgroup.c	block, bfq: fix uaf for bfqq in bic_set_bfqq()	2023-02-09 11:26:36 +01:00
bfq-iosched.c	block, bfq: fix uaf for bfqq in bic_set_bfqq()	2023-02-09 11:26:36 +01:00
bfq-iosched.h	bfq: Get rid of __bio_blkcg() usage	2022-06-09 10:23:19 +02:00
bfq-wf2q.c	block/bfq_wf2q: correct weight to ioprio	2022-04-08 14:23:55 +02:00
bio-integrity.c	block: bio-integrity: Copy flags when bio_integrity_payload is cloned	2023-03-10 09:39:05 +01:00
bio.c	block: prevent an integer overflow in bvec_try_merge_hw_page	2024-02-23 08:54:44 +01:00
blk-cgroup-rwstat.c	blk-cgroup: Fix the recursive blkg rwstat	2021-03-05 11:32:15 -07:00
blk-cgroup-rwstat.h	blk-cgroup: separate out blkg_rwstat under CONFIG_BLK_CGROUP_RWSTAT	2019-11-07 12:28:13 -07:00
blk-cgroup.c	blk-cgroup: bypass blkcg_deactivate_policy after destroying	2023-12-20 15:17:39 +01:00
blk-core.c	blk-core: use pr_warn_ratelimited() in bio_check_ro()	2023-11-20 11:08:29 +01:00
blk-crypto-fallback.c	block: rename BIO_MAX_PAGES to BIO_MAX_VECS	2021-03-11 07:47:48 -07:00
blk-crypto-internal.h	blk-mq: release crypto keyslot before reporting I/O complete	2023-05-11 23:00:16 +09:00
blk-crypto.c	blk-crypto: make blk_crypto_evict_key() more robust	2023-05-11 23:00:16 +09:00
blk-exec.c	block: return errors from blk_execute_rq()	2021-06-30 15:35:45 -06:00
blk-flush.c	block: Fix fsync always failed if once failed	2022-01-27 11:05:25 +01:00
blk-integrity.c	block: flush the integrity workqueue in blk_integrity_unregister	2021-09-14 20:03:30 -06:00
blk-ioc.c	block: fix default IO priority handling again	2022-08-11 13:07:50 +02:00
blk-iocost.c	blk-iocost: avoid out of bounds shift	2024-05-17 11:50:54 +02:00
blk-iolatency.c	block: don't allow the same type rq_qos add more than once	2022-08-17 14:24:24 +02:00
blk-ioprio.c	block: Introduce the ioprio rq-qos policy	2021-06-21 15:03:40 -06:00
blk-ioprio.h	block: Introduce the ioprio rq-qos policy	2021-06-21 15:03:40 -06:00
blk-lib.c	block: export blk_next_bio()	2021-06-17 15:51:20 +02:00
blk-map.c	block-map: add __GFP_ZERO flag for alloc_page in function bio_copy_kern	2022-03-08 19:12:31 +01:00
blk-merge.c	blk-mq: release crypto keyslot before reporting I/O complete	2023-05-11 23:00:16 +09:00
blk-mq-cpumap.c	blk-mq: remove the calling of local_memory_node()	2020-10-20 07:08:17 -06:00
blk-mq-debugfs-zoned.c	block: Cleanup license notice	2019-01-17 21:21:40 -07:00
blk-mq-debugfs.c	blk-mq: don't create hctx debugfs dir until q->debugfs_dir is created	2022-08-17 14:23:12 +02:00
blk-mq-debugfs.h	blk-mq: no need to check return value of debugfs_create functions	2019-06-13 03:00:30 -06:00
blk-mq-pci.c	block: Fix blk_mq_*_map_queues() kernel-doc headers	2019-05-31 15:12:34 -06:00
blk-mq-rdma.c	block: Fix blk_mq_*_map_queues() kernel-doc headers	2019-05-31 15:12:34 -06:00
blk-mq-sched.c	blk-mq: correct stale comment of .get_budget	2023-03-10 09:39:04 +01:00
blk-mq-sched.h	blk: Fix lock inversion between ioc lock and bfqd lock	2021-06-24 18:43:55 -06:00
blk-mq-sysfs.c	blk-mq: fix possible memleak when register 'hctx' failed	2022-12-31 13:14:43 +01:00
blk-mq-tag.c	blk-mq: avoid to iterate over stale request	2021-09-12 19:32:43 -06:00
blk-mq-tag.h	blk-mq: Some tag allocation code refactoring	2021-05-24 06:47:22 -06:00
blk-mq-virtio.c	blk-mq: Fix typo in comment	2020-03-17 20:55:21 +01:00
blk-mq.c	blk-mq: fix IO hang from sbitmap wakeup race	2024-02-23 08:54:52 +01:00
blk-mq.h	blk-mq: cancel blk-mq dispatch work in both blk_cleanup_queue and disk_release()	2021-12-01 09:04:56 +01:00
blk-pm.c	scsi: block: pm: Always set request queue runtime active in blk_post_runtime_resume()	2022-01-27 11:04:15 +01:00
blk-pm.h	block: Remove unused blk_pm_*() function definitions	2021-02-22 06:33:48 -07:00
blk-rq-qos.c	rq-qos: fix missed wake-ups in rq_qos_throttle try two	2021-06-08 15:12:57 -06:00
blk-rq-qos.h	block: don't allow the same type rq_qos add more than once	2022-08-17 14:24:24 +02:00
blk-settings.c	block: Clear zone limits for a non-zoned stacked queue	2024-04-10 16:18:35 +02:00
blk-stat.c	block: prevent division by zero in blk_rq_stat_sum()	2024-04-13 13:01:45 +02:00
blk-stat.h	block: deactivate blk_stat timer in wbt_disable_default()	2018-12-12 06:47:51 -07:00
blk-sysfs.c	block: fix use-after-free of q->q_usage_counter	2023-10-10 21:59:05 +02:00
blk-throttle.c	blk-throttle: fix lockdep warning of "cgroup_mutex or RCU read lock required!"	2023-12-20 15:17:39 +01:00
blk-timeout.c	block: blk-timeout: delete duplicated word	2020-07-31 16:29:47 -06:00
blk-wbt.c	blk-wbt: fix that 'rwb->wc' is always set to 1 in wbt_init()	2022-10-26 12:35:54 +02:00
blk-wbt.h	blk-wbt: introduce a new disable state to prevent false positive by rwb_enabled()	2021-06-21 15:03:41 -06:00
blk-zoned.c	block: Hold invalidate_lock in BLKRESETZONE ioctl	2021-11-18 19:17:15 +01:00
blk.h	block: bump max plugged deferred size from 16 to 32	2021-11-18 19:16:16 +01:00
bounce.c	block: use memcpy_from_bvec in __blk_queue_bounce	2021-08-02 13:37:28 -06:00
bsg-lib.c	scsi: bsg-lib: Fix commands without data transfer in bsg_transport_sg_io_fn()	2021-08-01 13:21:40 -04:00
bsg.c	scsi: bsg: Fix device unregistration	2021-09-14 00:22:15 -04:00
disk-events.c	block: increment diskseq on all media change events	2023-07-23 13:47:20 +02:00
elevator.c	block/wbt: fix negative inflight counter when remove scsi device	2022-02-23 12:03:15 +01:00
fops.c	block: Don't invalidate pagecache for invalid falloc modes	2024-01-15 18:51:07 +01:00
genhd.c	block: add check of 'minors' and 'first_minor' in device_add_disk()	2024-01-25 14:52:39 -08:00
holder.c	block: drop unused includes in <linux/genhd.h>	2022-03-16 14:23:46 +01:00
ioctl.c	block/ioctl: prefer different overflow check	2024-07-05 09:14:25 +02:00
ioprio.c	block: fix default IO priority handling again	2022-08-11 13:07:50 +02:00
keyslot-manager.c	blk-crypto: make blk_crypto_evict_key() more robust	2023-05-11 23:00:16 +09:00
kyber-iosched.c	kyber: avoid q->disk dereferences in trace points	2021-10-15 21:02:57 -06:00
mq-deadline.c	block: mq-deadline: Rename deadline_is_seq_writes()	2023-01-24 07:22:49 +01:00
opal_proto.h	block: sed-opal: handle empty atoms when parsing response	2024-03-26 18:21:13 -04:00
sed-opal.c	block: sed-opal: handle empty atoms when parsing response	2024-03-26 18:21:13 -04:00
t10-pi.c	block: use bvec_kmap_local in t10_pi_type1_{prepare,complete}	2021-08-02 13:37:28 -06:00