Commit 5e4298be authored Dec 15, 2015 by Bart Van Assche Committed by Jens Axboe Mar 15, 2016

brd: Fix discard request processing



Avoid that discard requests with size => PAGE_SIZE fail with
-EIO. Refuse discard requests if the discard size is not a
multiple of the page size.

Fixes: 2dbe5495 ("brd: Refuse improperly aligned discard requests")
Signed-off-by: Bart Van Assche <bart.vanassche@sandisk.com>
Reviewed-by: Jan Kara <jack@suse.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Robert Elliot <elliott@hp.com>
Cc: stable <stable@vger.kernel.org> # v4.4+
Signed-off-by: Jens Axboe <axboe@fb.com>

parent d4366414

drivers/block/brd.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -341,7 +341,7 @@ static blk_qc_t brd_make_request(struct request_queue q, struct bio bio)

		if (unlikely(bio->bi_rw & REQ_DISCARD)) {
		if (sector & ((PAGE_SIZE >> SECTOR_SHIFT) - 1) \|\|
		bio->bi_iter.bi_size & PAGE_MASK)
		bio->bi_iter.bi_size & ~PAGE_MASK)
		goto io_error;
		discard_from_brd(brd, sector, bio->bi_iter.bi_size);
		goto out;