aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mtd
diff options
context:
space:
mode:
authorRichard Genoud <richard.genoud@gmail.com>2012-09-12 14:26:26 +0200
committerBen Hutchings <ben@decadent.org.uk>2012-10-17 03:49:16 +0100
commit4a888aa97cc653cb4d82539caea9f149231aeaf0 (patch)
treec8f4d8e2efe8e95856ae52b3a0c17a562071de61 /drivers/mtd
parentf4c8c2f05a24536e4d883d6f3783c78aa6e773ff (diff)
downloadkernel_samsung_smdk4412-4a888aa97cc653cb4d82539caea9f149231aeaf0.zip
kernel_samsung_smdk4412-4a888aa97cc653cb4d82539caea9f149231aeaf0.tar.gz
kernel_samsung_smdk4412-4a888aa97cc653cb4d82539caea9f149231aeaf0.tar.bz2
mtd: nandsim: bugfix: fail if overridesize is too big
commit bb0a13a13411c4ce24c48c8ff3cdf7b48d237240 upstream. If override size is too big, the module was actually loaded instead of failing, because retval was not set. This lead to memory corruption with the use of the freed structs nandsim and nand_chip. Signed-off-by: Richard Genoud <richard.genoud@gmail.com> Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers/mtd')
-rw-r--r--drivers/mtd/nand/nandsim.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/mtd/nand/nandsim.c b/drivers/mtd/nand/nandsim.c
index 83e8e1b..ade0da0 100644
--- a/drivers/mtd/nand/nandsim.c
+++ b/drivers/mtd/nand/nandsim.c
@@ -2355,6 +2355,7 @@ static int __init ns_init_module(void)
uint64_t new_size = (uint64_t)nsmtd->erasesize << overridesize;
if (new_size >> overridesize != nsmtd->erasesize) {
NS_ERR("overridesize is too big\n");
+ retval = -EINVAL;
goto err_exit;
}
/* N.B. This relies on nand_scan not doing anything with the size before we change it */