Paolo Valente f990f0985e Revert "Revert "block, bfq: honor already-setup queue merges"" ...

[ Upstream commit 15729ff814 ]

A crash [1] happened to be triggered in conjunction with commit
2d52c58b9c ("block, bfq: honor already-setup queue merges"). The
latter was then reverted by commit ebc69e897e ("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 d29bd41428
("block, bfq: reset last_bfqq_created on group change").

So, there is no point in keeping commit 2d52c58b9c ("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:14:54 +02:00

..

partitions

…

badblocks.c

…

bfq-cgroup.c

block, bfq: fix overwrite of bfq_group pointer in bfq_find_set_group()

2020-03-25 08:06:08 +01:00

bfq-iosched.c

Revert "Revert "block, bfq: honor already-setup queue merges""

2022-04-15 14:14:54 +02:00

bfq-iosched.h

block, bfq: fix use after free in bfq_bfqq_expire

2021-12-29 12:20:43 +01:00

bfq-wf2q.c

block, bfq: fix use after free in bfq_bfqq_expire

2021-12-29 12:20:43 +01:00

bio-integrity.c

block: bio-integrity: Advance seed correctly for larger interval sizes

2022-02-08 18:23:14 +01:00

bio.c

block: only update parent bi_status when bio fail

2021-04-16 11:49:30 +02:00

blk-cgroup.c

bdi: use bdi_dev_name() to get device name

2021-08-08 08:54:29 +02:00

blk-core.c

block: split .sysfs_lock into two locks

2021-03-04 09:39:30 +01:00

blk-exec.c

…

blk-flush.c

block: Fix fsync always failed if once failed

2022-03-08 19:04:08 +01:00

blk-integrity.c

…

blk-ioc.c

block: Fix use-after-free issue accessing struct io_cq

2020-04-17 10:48:41 +02:00

blk-iolatency.c

blk-iolatency: error out if blk_get_queue() failed in iolatency_set_limit()

2021-08-12 13:19:40 +02:00

blk-lib.c

block: fix 32 bit overflow in __blkdev_issue_discard()

2020-02-01 09:37:12 +00:00

blk-map.c

block: fix memleak when __blk_rq_map_user_iov() is failed

2020-01-12 12:17:22 +01:00

blk-merge.c

block: don't merge across cgroup boundaries if blkcg is enabled

2022-04-15 14:14:41 +02:00

blk-mq-cpumap.c

…

blk-mq-debugfs-zoned.c

…

blk-mq-debugfs.c

block, scsi: Change the preempt-only flag into a counter

2019-08-04 09:30:57 +02:00

blk-mq-debugfs.h

…

blk-mq-pci.c

…

blk-mq-rdma.c

…

blk-mq-sched.c

blk-mq: order adding requests to hctx->dispatch and checking SCHED_RESTART

2020-09-03 11:24:26 +02:00

blk-mq-sched.h

…

blk-mq-sysfs.c

block: split .sysfs_lock into two locks

2021-03-04 09:39:30 +01:00

blk-mq-tag.c

…

blk-mq-tag.h

…

blk-mq-virtio.c

…

blk-mq.c

blk-mq: Swap two calls in blk_mq_exit_queue()

2021-05-22 10:59:46 +02:00

blk-mq.h

blk-mq: free hw queue's resource in hctx's release handler

2019-09-16 08:22:13 +02:00

blk-rq-qos.c

blk-wbt: fix performance regression in wbt scale_up/scale_down

2019-10-17 13:45:16 -07:00

blk-rq-qos.h

blk-rq-qos: fix first node deletion of rq_qos_del()

2019-10-29 09:20:09 +01:00

blk-settings.c

blk-settings: align max_sectors on "logical_block_size" boundary

2021-03-04 09:39:51 +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:14:43 +02:00

blk-tag.c

…

blk-throttle.c

blk-throttle: fix UAF by deleteing timer in blk_throtl_exit()

2021-09-26 13:39:49 +02:00

blk-timeout.c

…

blk-wbt.c

blk-wbt: make sure throttle is enabled properly

2021-07-20 16:15:48 +02:00

blk-wbt.h

blk-wbt: introduce a new disable state to prevent false positive by rwb_enabled()

2021-07-20 16:15:48 +02:00

blk-zoned.c

blk-zoned: allow BLKREPORTZONE without CAP_SYS_ADMIN

2021-09-22 11:47:57 +02:00

blk.h

block: split .sysfs_lock into two locks

2021-03-04 09:39:30 +01:00

bounce.c

…

bsg-lib.c

…

bsg.c

…

cfq-iosched.c

…

cmdline-parser.c

…

compat_ioctl.c

compat_ioctl: block: handle BLKREPORTZONE/BLKRESETZONE

2020-01-09 10:19:01 +01:00

deadline-iosched.c

…

elevator.c

block/wbt: fix negative inflight counter when remove scsi device

2022-02-23 11:58:40 +01:00

genhd.c

block: Suppress uevent for hidden device when removed

2021-03-30 14:36:59 +02:00

ioctl.c

…

ioprio.c

block: fix ioprio_get(IOPRIO_WHO_PGRP) vs setuid(2)

2021-12-14 10:18:07 +01:00

Kconfig

…

Kconfig.iosched

…

kyber-iosched.c

…

Makefile

…

mq-deadline.c

block: mq-deadline: Fix queue restart handling

2019-10-07 18:57:19 +02:00

noop-iosched.c

…

opal_proto.h

…

partition-generic.c

…

scsi_ioctl.c

…

sed-opal.c

…

t10-pi.c

…