Skip to content

blk-mq: fix request UAF related with iterating over tagset requests

Ming Lei linux-block 7 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v7 Latest4 patches 5 repliesIn review
  2. v64 patches 3 repliesSuperseded
  3. v54 patches 21 repliesSuperseded
Earlier versions · 4
VersionPostedPatchesRepliesStatus
v44 patches11 repliesSuperseded
v33 patches6 repliesSuperseded
v23 patches7 repliesSuperseded
v18 patches16 repliesSuperseded

Changes in v7 from the cover letter

- fix one null-ptr-deref during updating nr_hw_queues, because blk_mq_clear_flush_rq_mapping() may touch non-mapped hw queue's tags, only patch 4/4 is modified, reported and verified by Shinichiro Kawasaki
- run blktests and not see regression

Patches in v7 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/4block: avoid double io accounting for flush requestblock/blk-flush.c+1 -20 replies
2/4blk-mq: grab rq->refcount before calling ->fn in blk_mq_tagset_busy_iterblock/blk-mq-tag.c block/blk-mq.c block/blk-mq.h+43 -160 replies
3/4blk-mq: clear stale request in tags->rq[] before freeing one request poolblock/blk-mq-tag.c block/blk-mq-tag.h block/blk-mq.c+54 -70 replies
4/4blk-mq: clearing flush request reference in tags->rqs[]block/blk-mq.c+34 -10 replies

Reviews trailers per patch

All 4 patches have a Reviewed-by or Acked-by.

PatchBart Van AsscheChristoph HellwigJohn GarryDavid Jeffery
1/4R-b R-b T-b
2/4R-b R-b T-b
3/4R-b T-b R-b
4/4R-b T-b R-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 4 reviewers.

Read the v7 thread

Cover letter [PATCH V7 0/4] blk-mq: fix request UAF related with iterating over tagset requests

Hi Jens,

This patchset fixes the request UAF issue by one simple approach, without clearing ->rqs[] in fast path, please consider it for 5.13.

1) 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 2st patch

2) 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 3rd patch.

V7:
- fix one null-ptr-deref during updating nr_hw_queues, because blk_mq_clear_flush_rq_mapping() may touch non-mapped hw queue's tags, only patch 4/4 is modified, reported and verified by Shinichiro Kawasaki
- run blktests and not see regression

V6:
- hold spin lock when reading rq via ->rq[tag_bit], the issue is added in V5
- make blk_mq_find_and_get_req() more clean, as suggested by Bart
- not hold tags->lock when clearing ->rqs[] for avoiding to disable interrupt a bit long, as suggested by Bart
- code style change, as suggested by Christoph

V5:
- cover bt_iter() by same approach taken in bt_tags_iter(), and pass John's invasive test
- add tested-by/reviewed-by tag

V4:
- remove hctx->fq-flush_rq from tags->rqs[] before freeing hw queue, patch 4/4 is added, which is based on David's patch.

V3:
- drop patches for completing requests started in iterator ->fn, because blk-mq guarantees that valid request is passed to ->fn, and it is driver's responsibility for avoiding double completion. And drivers works well for not completing rq twice.
- add one patch for avoiding double accounting of flush rq

V2:
- take Bart's suggestion to not add blk-mq helper for completing requests when it is being iterated
- don't grab rq->ref if the iterator is over static rqs because the use case do require to iterate over all requests no matter if the request is initialized or not

Ming Lei (4):
block: avoid double io accounting for flush request
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
blk-mq: clearing flush request reference in tags->rqs[]

 block/blk-flush.c  |  3 +-
 block/blk-mq-tag.c | 49 ++++++++++++++++++------
 block/blk-mq-tag.h |  6 +++
 block/blk-mq.c     | 95 ++++++++++++++++++++++++++++++++++++++++------
 block/blk-mq.h     |  1 +
 5 files changed, 130 insertions(+), 24 deletions(-)
Signature · 1 line
2.29.2