aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoman Tereshonkov <roman.tereshonkov@nokia.com>2011-11-29 12:49:18 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2012-01-25 17:24:32 -0800
commit63f0d35a610b2ef1139b5d763ee74cab5257a8c8 (patch)
tree112893d2550d2aa704f3e0d5dd2f48a489cae3f7
parente9d23be2708477feeaec78e707c80441520c1ef6 (diff)
downloadkernel_samsung_aries-63f0d35a610b2ef1139b5d763ee74cab5257a8c8.zip
kernel_samsung_aries-63f0d35a610b2ef1139b5d763ee74cab5257a8c8.tar.gz
kernel_samsung_aries-63f0d35a610b2ef1139b5d763ee74cab5257a8c8.tar.bz2
mtdoops: fix the oops_page_used array size
commit 556f063580db2953a7e53cd46b47724246320f60 upstream. The array of unsigned long pointed by oops_page_used is allocated by vmalloc which requires the size to be in bytes. BITS_PER_LONG is equal to 32. If we want to allocate memory for 32 pages with one bit per page then 32 / BITS_PER_LONG is equal to 1 byte that is 8 bits. To fix it we need to multiply the result by sizeof(unsigned long) equal to 4. Signed-off-by: Roman Tereshonkov <roman.tereshonkov@nokia.com> Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@linux.intel.com> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/mtd/mtdoops.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/mtdoops.c b/drivers/mtd/mtdoops.c
index e3e40f4..02eeed3 100644
--- a/drivers/mtd/mtdoops.c
+++ b/drivers/mtd/mtdoops.c
@@ -369,7 +369,7 @@ static void mtdoops_notify_add(struct mtd_info *mtd)
/* oops_page_used is a bit field */
cxt->oops_page_used = vmalloc(DIV_ROUND_UP(mtdoops_pages,
- BITS_PER_LONG));
+ BITS_PER_LONG) * sizeof(unsigned long));
if (!cxt->oops_page_used) {
printk(KERN_ERR "mtdoops: could not allocate page array\n");
return;