* [PATCH] block, bfq: fix uaf for bfqq in bfq_exit_icq_bfqq
@ 2022-12-26 3:06 Yu Kuai
2022-12-26 11:18 ` Jan Kara
2022-12-26 19:11 ` Jens Axboe
0 siblings, 2 replies; 3+ messages in thread
From: Yu Kuai @ 2022-12-26 3:06 UTC (permalink / raw)
To: paolo.valente, axboe, jack
Cc: linux-block, linux-kernel, yukuai3, yukuai1, yi.zhang
From: Yu Kuai <yukuai3@huawei.com>
Commit 64dc8c732f5c ("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: 64dc8c732f5c ("block, bfq: fix possible uaf for 'bfqq->bic'")
Reported-by: Yi Zhang <yi.zhang@redhat.com>
Signed-off-by: Yu Kuai <yukuai3@huawei.com>
---
block/bfq-iosched.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c
index 16f43bbc575a..ccf2204477a5 100644
--- a/block/bfq-iosched.c
+++ b/block/bfq-iosched.c
@@ -5317,8 +5317,8 @@ static void bfq_exit_icq_bfqq(struct bfq_io_cq *bic, bool is_sync)
unsigned long flags;
spin_lock_irqsave(&bfqd->lock, flags);
- bfq_exit_bfqq(bfqd, bfqq);
bic_set_bfqq(bic, NULL, is_sync);
+ bfq_exit_bfqq(bfqd, bfqq);
spin_unlock_irqrestore(&bfqd->lock, flags);
}
}
--
2.31.1
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] block, bfq: fix uaf for bfqq in bfq_exit_icq_bfqq
2022-12-26 3:06 [PATCH] block, bfq: fix uaf for bfqq in bfq_exit_icq_bfqq Yu Kuai
@ 2022-12-26 11:18 ` Jan Kara
2022-12-26 19:11 ` Jens Axboe
1 sibling, 0 replies; 3+ messages in thread
From: Jan Kara @ 2022-12-26 11:18 UTC (permalink / raw)
To: Yu Kuai
Cc: paolo.valente, axboe, jack, linux-block, linux-kernel, yukuai3, yi.zhang
On Mon 26-12-22 11:06:05, Yu Kuai wrote:
> From: Yu Kuai <yukuai3@huawei.com>
>
> Commit 64dc8c732f5c ("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: 64dc8c732f5c ("block, bfq: fix possible uaf for 'bfqq->bic'")
> Reported-by: Yi Zhang <yi.zhang@redhat.com>
> Signed-off-by: Yu Kuai <yukuai3@huawei.com>
Thanks for the patch! Feel free to add:
Reviewed-by: Jan Kara <jack@suse.cz>
Honza
> ---
> block/bfq-iosched.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c
> index 16f43bbc575a..ccf2204477a5 100644
> --- a/block/bfq-iosched.c
> +++ b/block/bfq-iosched.c
> @@ -5317,8 +5317,8 @@ static void bfq_exit_icq_bfqq(struct bfq_io_cq *bic, bool is_sync)
> unsigned long flags;
>
> spin_lock_irqsave(&bfqd->lock, flags);
> - bfq_exit_bfqq(bfqd, bfqq);
> bic_set_bfqq(bic, NULL, is_sync);
> + bfq_exit_bfqq(bfqd, bfqq);
> spin_unlock_irqrestore(&bfqd->lock, flags);
> }
> }
> --
> 2.31.1
>
--
Jan Kara <jack@suse.com>
SUSE Labs, CR
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] block, bfq: fix uaf for bfqq in bfq_exit_icq_bfqq
2022-12-26 3:06 [PATCH] block, bfq: fix uaf for bfqq in bfq_exit_icq_bfqq Yu Kuai
2022-12-26 11:18 ` Jan Kara
@ 2022-12-26 19:11 ` Jens Axboe
1 sibling, 0 replies; 3+ messages in thread
From: Jens Axboe @ 2022-12-26 19:11 UTC (permalink / raw)
To: paolo.valente, jack, Yu Kuai; +Cc: linux-block, linux-kernel, yukuai3, yi.zhang
On Mon, 26 Dec 2022 11:06:05 +0800, Yu Kuai wrote:
> Commit 64dc8c732f5c ("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().
>
>
> [...]
Applied, thanks!
[1/1] block, bfq: fix uaf for bfqq in bfq_exit_icq_bfqq
commit: 246cf66e300b76099b5dbd3fdd39e9a5dbc53f02
Best regards,
--
Jens Axboe
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-12-26 21:59 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-12-26 3:06 [PATCH] block, bfq: fix uaf for bfqq in bfq_exit_icq_bfqq Yu Kuai
2022-12-26 11:18 ` Jan Kara
2022-12-26 19:11 ` Jens Axboe
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®