openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

mtd: rawnand: s3c2410: Error out when ->nrsets < 0 or ->sets == NULL 

All of the code in the probe path assumes ->sets != NULL and
->nrsets > 0. Error out if that's not the case to avoid dereferencing a
NULL pointer.

Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
This commit is contained in:
Boris Brezillon 2018-07-19 22:53:50 +02:00 committed by Miquel Raynal
parent 760c435e0f
commit bdc4e58d53
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/mtd/nand/raw/s3c2410.c
View File

@ -1134,8 +1134,13 @@ static int s3c24xx_nand_probe(struct platform_device *pdev)
dev_dbg(&pdev->dev, "mapped registers at %p\n", info->regs); dev_dbg(&pdev->dev, "mapped registers at %p\n", info->regs);
sets = (plat != NULL) ? plat->sets : NULL; if (!plat->sets || plat->nr_sets < 1) {
nr_sets = (plat != NULL) ? plat->nr_sets : 1; err = -EINVAL;
goto exit_error;
}
sets = plat->sets;
nr_sets = plat->nr_sets;
info->mtd_count = nr_sets; info->mtd_count = nr_sets;
@ -1152,7 +1157,7 @@ static int s3c24xx_nand_probe(struct platform_device *pdev)
nmtd = info->mtds; nmtd = info->mtds;
for (setno = 0; setno < nr_sets; setno++, nmtd++) { for (setno = 0; setno < nr_sets; setno++, nmtd++, sets++) {
struct mtd_info *mtd = nand_to_mtd(&nmtd->chip); struct mtd_info *mtd = nand_to_mtd(&nmtd->chip);
pr_debug("initialising set %d (%p, info %p)\n", pr_debug("initialising set %d (%p, info %p)\n",
@ -1174,9 +1179,6 @@ static int s3c24xx_nand_probe(struct platform_device *pdev)
goto exit_error; goto exit_error;
s3c2410_nand_add_partition(info, nmtd, sets); s3c2410_nand_add_partition(info, nmtd, sets);
if (sets != NULL)
sets++;
} }
/* initialise the hardware */ /* initialise the hardware */