index fa286a8..3cb92c1 100644
@@ -2482,7 +2482,7 @@ static int nand_flash_detect_onfi(struct mtd_info *mtd,
 	mtd->writesize = le32_to_cpu(p->byte_per_page);
 	mtd->erasesize = le32_to_cpu(p->pages_per_block) * mtd->writesize;
 	mtd->oobsize = le16_to_cpu(p->spare_bytes_per_page);
-	chip->chipsize = le32_to_cpu(p->blocks_per_lun) * mtd->erasesize;
+	chip->chipsize = (uint64_t)le32_to_cpu(p->blocks_per_lun) * mtd->erasesize;
 	*busw = 0;
 	if (le16_to_cpu(p->features) & 1)
 		*busw = NAND_BUSWIDTH_16;

Signature · 1 line

1.7.1

Scott Wood

2011-04-04 18:21 UTC #1 lore raw

PATCH 1/2 NAND: Fix integer overflow in ONFI detection of chips >= 4GiB

Quoted 8 lines · Florian Fainelli

From: Florian Fainelli <[email protected]>
This patch sync with David's patch on Linux in nand_flash_detect_onfi()
commit 4ccb3b4497ce01fab4933704fe21581e30fda1a5
Author: David Woodhouse <[email protected]>
Date: Fri Dec 3 16:36:34 2010 +0000

Quoted 5 lines

mtd: nand: Fix integer overflow in ONFI detection of chips >= 4GiB
Signed-off-by David Woodhouse <[email protected]>
Signed-off-by Florian Fainelli <[email protected]>

Applied both patches, but next time just send the Linux patch as-is, with a From: line in the body of the e-mail indicating the original author.

-Scott