From: Jan Kara <jack@suse.com>
To: axboe@kernel.dk
Cc: LKML <linux-kernel@vger.kernel.org>,
linux-fsdevel@vger.kernel.org,
Christoph Hellwig <hch@infradead.org>, Jan Kara <jack@suse.com>
Subject: [PATCH] brd: Refuse improperly aligned discard requests
Date: Wed, 4 Nov 2015 17:13:39 +0100 [thread overview]
Message-ID: <1446653619-22880-1-git-send-email-jack@suse.com> (raw)
Currently when improperly aligned discard request is submitted, we just
silently discard more / less data which results in filesystem corruption
in some cases. Refuse such misaligned requests.
Signed-off-by: Jan Kara <jack@suse.com>
---
drivers/block/brd.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/block/brd.c b/drivers/block/brd.c
index b9794aeeb878..4ef4cdf67ede 100644
--- a/drivers/block/brd.c
+++ b/drivers/block/brd.c
@@ -337,6 +337,9 @@ static void 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;
}
--
2.1.4
next reply other threads:[~2015-11-04 16:13 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-04 16:13 Jan Kara [this message]
2015-11-05 4:18 ` [PATCH] brd: Refuse improperly aligned discard requests Elliott, Robert (Persistent Memory)
2015-11-05 8:06 ` Jan Kara
2015-11-05 20:11 ` Jens Axboe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1446653619-22880-1-git-send-email-jack@suse.com \
--to=jack@suse.com \
--cc=axboe@kernel.dk \
--cc=hch@infradead.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).