Skip to content

Commit dd8b058

Browse files
Ming Leiaxboe
authored andcommitted
block: fix NULL pointer dereferenced within __blk_rq_map_sg
The block layer internal flush request may not have bio attached, so the request iterator has to be initialized from valid req->bio, otherwise NULL pointer dereferenced is triggered. Cc: Christoph Hellwig <hch@lst.de> Reported-and-tested-by: Cheyenne Wills <cheyenne.wills@gmail.com> Fixes: b7175e2 ("block: add a dma mapping iterator") Signed-off-by: Ming Lei <ming.lei@redhat.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Link: https://lore.kernel.org/r/20250217031626.461977-1-ming.lei@redhat.com Signed-off-by: Jens Axboe <axboe@kernel.dk>
1 parent 43c70b1 commit dd8b058

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

block/blk-merge.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -556,11 +556,14 @@ int __blk_rq_map_sg(struct request_queue *q, struct request *rq,
556556
{
557557
struct req_iterator iter = {
558558
.bio = rq->bio,
559-
.iter = rq->bio->bi_iter,
560559
};
561560
struct phys_vec vec;
562561
int nsegs = 0;
563562

563+
/* the internal flush request may not have bio attached */
564+
if (iter.bio)
565+
iter.iter = iter.bio->bi_iter;
566+
564567
while (blk_map_iter_next(rq, &iter, &vec)) {
565568
*last_sg = blk_next_sg(last_sg, sglist);
566569
sg_set_page(*last_sg, phys_to_page(vec.paddr), vec.len,

0 commit comments

Comments
 (0)