public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
* [U-Boot] [PATCH 1/2] NAND: Fix integer overflow in ONFI detection of chips >= 4GiB
@ 2011-04-03 16:23 Florian Fainelli
  2011-04-04 18:21 ` Scott Wood
  0 siblings, 1 reply; 2+ messages in thread
From: Florian Fainelli @ 2011-04-03 16:23 UTC (permalink / raw)
  To: u-boot

From: Florian Fainelli <florian@openwrt.org>

This patch sync with David's patch on Linux in nand_flash_detect_onfi()

	commit 4ccb3b4497ce01fab4933704fe21581e30fda1a5
	Author: David Woodhouse <David.Woodhouse@intel.com>
	Date:   Fri Dec 3 16:36:34 2010 +0000

    	mtd: nand: Fix integer overflow in ONFI detection of chips >= 4GiB

    	Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

Signed-off-by: Florian Fainelli <florian@openwrt.org>
---
diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
index fa286a8..3cb92c1 100644
--- a/drivers/mtd/nand/nand_base.c
+++ b/drivers/mtd/nand/nand_base.c
@@ -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;
-- 
1.7.1

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [U-Boot] [PATCH 1/2] NAND: Fix integer overflow in ONFI detection of chips >= 4GiB
  2011-04-03 16:23 [U-Boot] [PATCH 1/2] NAND: Fix integer overflow in ONFI detection of chips >= 4GiB Florian Fainelli
@ 2011-04-04 18:21 ` Scott Wood
  0 siblings, 0 replies; 2+ messages in thread
From: Scott Wood @ 2011-04-04 18:21 UTC (permalink / raw)
  To: u-boot

On Sun, Apr 03, 2011 at 06:23:52PM +0200, Florian Fainelli wrote:
> From: Florian Fainelli <florian@openwrt.org>
> 
> This patch sync with David's patch on Linux in nand_flash_detect_onfi()
> 
> 	commit 4ccb3b4497ce01fab4933704fe21581e30fda1a5
> 	Author: David Woodhouse <David.Woodhouse@intel.com>
> 	Date:   Fri Dec 3 16:36:34 2010 +0000
> 
>     	mtd: nand: Fix integer overflow in ONFI detection of chips >= 4GiB
> 
>     	Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
> 
> Signed-off-by: Florian Fainelli <florian@openwrt.org>

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

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2011-04-04 18:21 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-04-03 16:23 [U-Boot] [PATCH 1/2] NAND: Fix integer overflow in ONFI detection of chips >= 4GiB Florian Fainelli
2011-04-04 18:21 ` Scott Wood

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox