Message ID | 20110106140536.GB1717@bicker |
---|---|
State | New, archived |
Headers | show |
On Thu, 2011-01-06 at 17:05 +0300, Dan Carpenter wrote: > "info->cmdset" gets dereferenced in __readid() so it needs to be > initialized earlier in the function. This bug was introduced in > 18c81b1828f8 "mtd: pxa3xx_nand: remove the flash info in driver > structure". > > Cc: stable@kernel.org [2.6.37+] > Reported-and-tested-by: Sven Neumann <s.neumann@raumfeld.com> > Signed-off-by: Dan Carpenter <error27@gmail.com> > --- > v2: changed the commit text. added stable@kernel.org and a reported-by tag. Pushed to l2-mtd-2.6.git, thanks!
diff --git a/drivers/mtd/nand/pxa3xx_nand.c b/drivers/mtd/nand/pxa3xx_nand.c index 17f8518..ea2c288 100644 --- a/drivers/mtd/nand/pxa3xx_nand.c +++ b/drivers/mtd/nand/pxa3xx_nand.c @@ -885,6 +885,7 @@ static int pxa3xx_nand_detect_config(struct pxa3xx_nand_info *info) /* set info fields needed to __readid */ info->read_id_bytes = (info->page_size == 2048) ? 4 : 2; info->reg_ndcr = ndcr; + info->cmdset = &default_cmdset; if (__readid(info, &id)) return -ENODEV; @@ -915,7 +916,6 @@ static int pxa3xx_nand_detect_config(struct pxa3xx_nand_info *info) info->ndtr0cs0 = nand_readl(info, NDTR0CS0); info->ndtr1cs0 = nand_readl(info, NDTR1CS0); - info->cmdset = &default_cmdset; return 0; }
"info->cmdset" gets dereferenced in __readid() so it needs to be initialized earlier in the function. This bug was introduced in 18c81b1828f8 "mtd: pxa3xx_nand: remove the flash info in driver structure". Cc: stable@kernel.org [2.6.37+] Reported-and-tested-by: Sven Neumann <s.neumann@raumfeld.com> Signed-off-by: Dan Carpenter <error27@gmail.com> --- v2: changed the commit text. added stable@kernel.org and a reported-by tag.