Paolo Valente
931aff6274
Revert "Revert "block, bfq: honor already-setup queue merges""
...
[ Upstream commit 15729ff8143f8135b03988a100a19e66d7cb7ecd ]
A crash [1] happened to be triggered in conjunction with commit
2d52c58b9c9b ("block, bfq: honor already-setup queue merges"). The
latter was then reverted by commit ebc69e897e17 ("Revert "block, bfq:
honor already-setup queue merges""). Yet, the reverted commit was not
the one introducing the bug. In fact, it actually triggered a UAF
introduced by a different commit, and now fixed by commit d29bd41428cf
("block, bfq: reset last_bfqq_created on group change").
So, there is no point in keeping commit 2d52c58b9c9b ("block, bfq:
honor already-setup queue merges") out. This commit restores it.
[1] https://bugzilla.kernel.org/show_bug.cgi?id=214503
Reported-by: Holger Hoffstätte <holger@applied-asynchrony.com>
Signed-off-by: Paolo Valente <paolo.valente@linaro.org>
Link: https://lore.kernel.org/r/20211125181510.15004-1-paolo.valente@linaro.org
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Sasha Levin <sashal@kernel.org>
2022-04-15 14:18:23 +02:00
..
partitions
badblocks.c
bfq-cgroup.c
block, bfq: don't move oom_bfqq
2022-04-15 14:18:22 +02:00
bfq-iosched.c
Revert "Revert "block, bfq: honor already-setup queue merges""
2022-04-15 14:18:23 +02:00
bfq-iosched.h
bfq: fix blkio cgroup leakage v4
2020-09-03 11:26:54 +02:00
bfq-wf2q.c
bfq: fix blkio cgroup leakage v4
2020-09-03 11:26:54 +02:00
bio-integrity.c
block: bio-integrity: Advance seed correctly for larger interval sizes
2022-02-08 18:24:28 +01:00
bio.c
block: Fix wrong offset in bio_truncate()
2022-02-01 17:24:39 +01:00
blk-cgroup.c
blk-cgroup: fix UAF by grabbing blkcg lock before destroying blkg pd
2021-09-30 10:09:25 +02:00
blk-core.c
Revert "Revert "block: end bio with BLK_STS_AGAIN in case of non-mq devs and REQ_NOWAIT""
2021-02-07 15:35:47 +01:00
blk-exec.c
blk-flush.c
block: Fix fsync always failed if once failed
2022-03-08 19:07:47 +01:00
blk-integrity.c
blk-ioc.c
blk-iocost.c
blk-iocost: ioc_pd_free() shouldn't assume irq disabled
2020-09-09 19:12:35 +02:00
blk-iolatency.c
blk-iolatency: error out if blk_get_queue() failed in iolatency_set_limit()
2021-08-12 13:20:58 +02:00
blk-lib.c
blk-map.c
blk-merge.c
block: don't merge across cgroup boundaries if blkcg is enabled
2022-04-15 14:18:01 +02:00
blk-mq-cpumap.c
blk-mq-debugfs-zoned.c
blk-mq-debugfs.c
blk-mq-debugfs.h
blk-mq-pci.c
blk-mq-rdma.c
blk-mq-sched.c
kyber: fix out of bounds access when preempted
2021-05-19 10:08:30 +02:00
blk-mq-sched.h
block: only call sched requeue_request() for scheduled requests
2020-09-23 12:40:37 +02:00
blk-mq-sysfs.c
blk-mq: move cancel of hctx->run_work to the front of blk_exit_queue
2020-10-29 09:57:34 +01:00
blk-mq-tag.c
blk-mq-tag.h
blk-mq-virtio.c
blk-mq.c
block: remove inaccurate requeue check
2021-11-17 09:48:31 +01:00
blk-mq.h
blk-pm.c
scsi: block: Fix a race in the runtime power management code
2021-01-06 14:48:37 +01:00
blk-pm.h
blk-rq-qos.c
rq-qos: fix missed wake-ups in rq_qos_throttle try two
2021-07-19 08:53:16 +02:00
blk-rq-qos.h
block: fix race between adding/removing rq qos and normal IO
2021-07-14 16:53:18 +02:00
blk-settings.c
blk-settings: align max_sectors on "logical_block_size" boundary
2021-03-04 10:26:40 +01:00
blk-softirq.c
blk-stat.c
blk-stat.h
blk-sysfs.c
block: don't delete queue kobject before its children
2022-04-15 14:18:05 +02:00
blk-throttle.c
blk-throttle: fix UAF by deleteing timer in blk_throtl_exit()
2021-09-26 14:07:13 +02:00
blk-timeout.c
blk-wbt.c
blk-wbt: make sure throttle is enabled properly
2021-07-14 16:53:25 +02:00
blk-wbt.h
blk-wbt: introduce a new disable state to prevent false positive by rwb_enabled()
2021-07-14 16:53:25 +02:00
blk-zoned.c
blk-zoned: allow BLKREPORTZONE without CAP_SYS_ADMIN
2021-09-22 12:26:19 +02:00
blk.h
bounce.c
bsg-lib.c
bsg.c
scsi: bsg: Remove support for SCSI_IOCTL_SEND_COMMAND
2021-09-22 12:26:23 +02:00
cmdline-parser.c
compat_ioctl.c
elevator.c
block/wbt: fix negative inflight counter when remove scsi device
2022-02-23 11:59:59 +01:00
genhd.c
block: Suppress uevent for hidden device when removed
2021-03-30 14:35:23 +02:00
ioctl.c
ioprio.c
block: fix ioprio_get(IOPRIO_WHO_PGRP) vs setuid(2)
2021-12-14 14:49:02 +01:00
Kconfig
Kconfig.iosched
kyber-iosched.c
kyber: fix out of bounds access when preempted
2021-05-19 10:08:30 +02:00
Makefile
mq-deadline.c
kyber: fix out of bounds access when preempted
2021-05-19 10:08:30 +02:00
opal_proto.h
partition-generic.c
scsi_ioctl.c
sed-opal.c
t10-pi.c