[PATCH 0/8] blk-mq: fix request UAF related with iterating over tagset requests

Ming Lei
2021-04-25T08:58:06Z

Hi Guys,

Revert 4 patches from Bart which try to fix request UAF issue related
with iterating over tagset wide requests, because:

1) request UAF caused by normal completion vs. async completion during
iterating can't be covered[1]

2) clearing ->rqs[] is added in fast path, which causes performance loss
by 1% according to Bart's test

3) Bart's approach is too complicated, and some changes aren't needed,
such as adding two versions of tagset iteration

This patchset fixes the request UAF issue by one simpler approach,
without any change in fast path.

1) always complete request synchronously when the completing is run
via blk_mq_tagset_busy_iter(), done in 1st two patches

2) grab request's ref before calling ->fn in blk_mq_tagset_busy_iter,
and release it after calling ->fn, so ->fn won't be called for one
request if its queue is frozen, done in 3rd patch

3) clearing any stale request referred in ->rqs[] before freeing the
request pool, one per-tags spinlock is added for protecting
grabbing request ref vs. clearing ->rqs[tag], so UAF by refcount_inc_not_zero
in bt_tags_iter() is avoided, done in 4th patch.

[1] https://lore.kernel.org/linux-block/YISzLal7Ur7jyuiy@T590/T/#u

Ming Lei (8):
Revert "blk-mq: Fix races between blk_mq_update_nr_hw_queues() and
iterating over tags"
Revert "blk-mq: Make it safe to use RCU to iterate over
blk_mq_tag_set.tag_list"
Revert "blk-mq: Fix races between iterating over requests and freeing
requests"
Revert "blk-mq: Introduce atomic variants of
blk_mq_(all_tag|tagset_busy)_iter"
blk-mq: blk_mq_complete_request_locally
block: drivers: complete request locally from blk_mq_tagset_busy_iter
blk-mq: grab rq->refcount before calling ->fn in
blk_mq_tagset_busy_iter
blk-mq: clear stale request in tags->rq[] before freeing one request
pool

block/blk-core.c | 34 +------
block/blk-mq-tag.c | 147 ++++++------------------------
block/blk-mq-tag.h | 7 +-
block/blk-mq.c | 100 +++++++++++++-------
block/blk-mq.h | 2 +-
block/blk.h | 2 -
block/elevator.c | 1 -
drivers/block/mtip32xx/mtip32xx.c | 2 +-
drivers/block/nbd.c | 2 +-
drivers/nvme/host/core.c | 2 +-
drivers/scsi/hosts.c | 16 ++--
drivers/scsi/scsi_lib.c | 6 +-
drivers/scsi/ufs/ufshcd.c | 4 +-
include/linux/blk-mq.h | 3 +-
14 files changed, 119 insertions(+), 209 deletions(-)

--
2.29.2