diff options
| author |   Bart Van Assche <bart.vanassche@sandisk.com> | 2015-12-15 16:38:22 +0100 |
|---|---|---|
| committer |   Jens Axboe <axboe@fb.com> | 2016-03-15 14:10:29 -0700 |
| commit | 5e4298be45e83ecdffaabb370eea9396889b07f1 (patch) | |
| tree | 6b837a6a666337c8129b8d836a7ae48b50a9fc5d /drivers/block | |
| parent | cpqarray: remove it from the kernel (diff) | |
| download | linux-dev-5e4298be45e83ecdffaabb370eea9396889b07f1.tar.xz linux-dev-5e4298be45e83ecdffaabb370eea9396889b07f1.zip | |
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: 2dbe54957636 ("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>
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | drivers/block/brd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/brd.c b/drivers/block/brd.c index cb27190e9f39..f7ecc287d733 100644 --- a/drivers/block/brd.c +++ b/drivers/block/brd.c @@ -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; |