X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=drivers%2Fblock%2Fbrd.c;h=a5880f4ab40eb069bda60d6403b223d61ff1db80;hb=081f3698e606dc733ee0ffc89433b597ff5b7fb6;hp=c9f9c30d646756296e0e4bdd212a33ba28a479b6;hpb=a18e2fa5e670a1b84e66522b221c42875b02028a;p=firefly-linux-kernel-4.4.55.git

diff --git a/drivers/block/brd.c b/drivers/block/brd.c
index c9f9c30d6467..a5880f4ab40e 100644
--- a/drivers/block/brd.c
+++ b/drivers/block/brd.c
@@ -337,6 +337,9 @@ static blk_qc_t brd_make_request(struct request_queue *q, struct bio *bio)
 		goto io_error;
 
 	if (unlikely(bio->bi_rw & REQ_DISCARD)) {
+		if (sector & ((PAGE_SIZE >> SECTOR_SHIFT) - 1) ||
+		    bio->bi_iter.bi_size & PAGE_MASK)
+			goto io_error;
 		discard_from_brd(brd, sector, bio->bi_iter.bi_size);
 		goto out;
 	}