Commit 75f8b2f5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'block-6.12-20241026' of git://git.kernel.dk/linux 

Pull block fixes from Jens Axboe:

 - Pull request for MD via Song fixing a few issues

 - Fix a wrong check in blk_rq_map_user_bvec(), causing IO errors on
   passthrough IO (Xinyu)

* tag 'block-6.12-20241026' of git://git.kernel.dk/linux:
  block: fix sanity checks in blk_rq_map_user_bvec
  md/raid10: fix null ptr dereference in raid10_size()
  md: ensure child flush IO does not affect origin bio->bi_status
parents a8b3be26 2ff94944

block/blk-map.c

+1 −3
Original line number Diff line number Diff line
@@ -600,9 +600,7 @@ static int blk_rq_map_user_bvec(struct request *rq, const struct iov_iter *iter) 
		if (nsegs >= nr_segs || bytes > UINT_MAX - bv->bv_len)

			goto put_bio;

		if (bytes + bv->bv_len > nr_iter)

			goto put_bio;

		if (bv->bv_offset + bv->bv_len > PAGE_SIZE)

			goto put_bio;

			break;



		nsegs++;

		bytes += bv->bv_len;

drivers/md/md.c

+23 −1
Original line number Diff line number Diff line
@@ -546,6 +546,26 @@ static int mddev_set_closing_and_sync_blockdev(struct mddev *mddev, int opener_n 
	return 0;

}



/*

 * The only difference from bio_chain_endio() is that the current

 * bi_status of bio does not affect the bi_status of parent.

 */

static void md_end_flush(struct bio *bio)

{

	struct bio *parent = bio->bi_private;



	/*

	 * If any flush io error before the power failure,

	 * disk data may be lost.

	 */

	if (bio->bi_status)

		pr_err("md: %pg flush io error %d\n", bio->bi_bdev,

			blk_status_to_errno(bio->bi_status));



	bio_put(bio);

	bio_endio(parent);

}



bool md_flush_request(struct mddev *mddev, struct bio *bio)

{

	struct md_rdev *rdev;
@@ -565,7 +585,9 @@ bool md_flush_request(struct mddev *mddev, struct bio *bio) 
		new = bio_alloc_bioset(rdev->bdev, 0,

				       REQ_OP_WRITE | REQ_PREFLUSH, GFP_NOIO,

				       &mddev->bio_set);

		bio_chain(new, bio);

		new->bi_private = bio;

		new->bi_end_io = md_end_flush;

		bio_inc_remaining(bio);

		submit_bio(new);

	}

drivers/md/raid10.c

+5 −2
Original line number Diff line number Diff line
@@ -4061,10 +4061,13 @@ static int raid10_run(struct mddev *mddev) 
	}



	if (!mddev_is_dm(conf->mddev)) {

		ret = raid10_set_queue_limits(mddev);

		if (ret)

		int err = raid10_set_queue_limits(mddev);



		if (err) {

			ret = err;

			goto out_free_conf;

		}

	}



	/* need to check that every block has at least one working mirror */

	if (!enough(conf, -1)) {