Skip to content

Commit 7949b0d

Browse files
YuKuai-huaweigregkh
authored andcommitted
block, bfq: fix uaf for bfqq in bfq_exit_icq_bfqq
[ Upstream commit 246cf66 ] Commit 64dc8c7 ("block, bfq: fix possible uaf for 'bfqq->bic'") will access 'bic->bfqq' in bic_set_bfqq(), however, bfq_exit_icq_bfqq() can free bfqq first, and then call bic_set_bfqq(), which will cause uaf. Fix the problem by moving bfq_exit_bfqq() behind bic_set_bfqq(). Fixes: 64dc8c7 ("block, bfq: fix possible uaf for 'bfqq->bic'") Reported-by: Yi Zhang <[email protected]> Signed-off-by: Yu Kuai <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jens Axboe <[email protected]> Signed-off-by: Sasha Levin <[email protected]>
1 parent ff3d9ab commit 7949b0d

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

block/bfq-iosched.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5251,8 +5251,8 @@ static void bfq_exit_icq_bfqq(struct bfq_io_cq *bic, bool is_sync)
52515251
unsigned long flags;
52525252

52535253
spin_lock_irqsave(&bfqd->lock, flags);
5254-
bfq_exit_bfqq(bfqd, bfqq);
52555254
bic_set_bfqq(bic, NULL, is_sync);
5255+
bfq_exit_bfqq(bfqd, bfqq);
52565256
spin_unlock_irqrestore(&bfqd->lock, flags);
52575257
}
52585258
}

0 commit comments

Comments
 (0)