mtd: block2mtd: check device size

[Linux-MTD Mailing List]

Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=ea6d833a3fddcd1d60414d48f34c7f4fbe88608f
Commit:     ea6d833a3fddcd1d60414d48f34c7f4fbe88608f
Parent:     90445ff6241e2a13445310803e2efa606c61f276
Author:     Fabian Frederick <fabf at skynet.be>
AuthorDate: Thu Mar 6 18:04:22 2014 +0800
Committer:  Brian Norris <computersforpeace at gmail.com>
CommitDate: Mon Mar 10 22:42:31 2014 -0700

    mtd: block2mtd: check device size
    
    fixme applied : check device size is a multiple of erasesize.
    
    Signed-off-by: Fabian Frederick <fabf at skynet.be>
    Signed-off-by: Brian Norris <computersforpeace at gmail.com>
---
 drivers/mtd/devices/block2mtd.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/mtd/devices/block2mtd.c b/drivers/mtd/devices/block2mtd.c
index 3e12234..66f0405 100644
--- a/drivers/mtd/devices/block2mtd.c
+++ b/drivers/mtd/devices/block2mtd.c
@@ -209,7 +209,6 @@ static void block2mtd_free_device(struct block2mtd_dev *dev)
 }
 
 
-/* FIXME: ensure that mtd->size % erase_size == 0 */
 static struct block2mtd_dev *add_device(char *devname, int erase_size)
 {
 	const fmode_t mode = FMODE_READ | FMODE_WRITE | FMODE_EXCL;
@@ -249,6 +248,11 @@ static struct block2mtd_dev *add_device(char *devname, int erase_size)
 		goto err_free_block2mtd;
 	}
 
+	if ((long)dev->blkdev->bd_inode->i_size % erase_size) {
+		pr_err("erasesize must be a divisor of device size\n");
+		goto err_free_block2mtd;
+	}
+
 	mutex_init(&dev->write_mutex);
 
 	/* Setup the MTD structure */