aboutsummaryrefslogtreecommitdiff
path: root/drivers/md/bcache
diff options
context:
space:
mode:
authorKent Overstreet <koverstreet@google.com>2013-04-23 21:51:48 -0700
committerKent Overstreet <koverstreet@google.com>2013-04-24 13:07:39 -0700
commit8abb2a5dbadab91f9cae22270054e9ee3b3a1d2f (patch)
treeef40e5ed1d1833152ca8b542a688f9664820201f /drivers/md/bcache
parenta09ded8edf9ed4009930713e101249084cbcea5c (diff)
downloadlinaro-lsk-8abb2a5dbadab91f9cae22270054e9ee3b3a1d2f.tar.gz
bcache: Make sure blocksize isn't smaller than device blocksize
Sanity check to make sure we don't end up doing IO the device doesn't support. Signed-off-by: Kent Overstreet <koverstreet@google.com>
Diffstat (limited to 'drivers/md/bcache')
-rw-r--r--drivers/md/bcache/super.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/md/bcache/super.c b/drivers/md/bcache/super.c
index 6817ea46cf0..b3601476f7d 100644
--- a/drivers/md/bcache/super.c
+++ b/drivers/md/bcache/super.c
@@ -139,13 +139,17 @@ static const char *read_super(struct cache_sb *sb, struct block_device *bdev,
if (bch_is_zero(sb->uuid, 16))
goto err;
+ sb->block_size = le16_to_cpu(s->block_size);
+
+ err = "Superblock block size smaller than device block size";
+ if (sb->block_size << 9 < bdev_logical_block_size(bdev))
+ goto err;
+
switch (sb->version) {
case BCACHE_SB_VERSION_BDEV:
- sb->block_size = le16_to_cpu(s->block_size);
sb->data_offset = BDEV_DATA_START_DEFAULT;
break;
case BCACHE_SB_VERSION_BDEV_WITH_OFFSET:
- sb->block_size = le16_to_cpu(s->block_size);
sb->data_offset = le64_to_cpu(s->data_offset);
err = "Bad data offset";