korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-18 00:24:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

mtd: fsl-quadspi: possible NULL dereference

Browse Source 
It is theoretically possible to probe this driver without a matching
device tree, so let's guard against this.

Also, use the of_device_get_match_data() helper to make this a bit
simpler.

Coverity complained about this one.

Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Acked-by: Han xu <han.xu@freescale.com>
This commit is contained in:
Brian Norris 2015-11-16 10:45:30 -08:00
parent fc5adbebac
commit c98f71d1c0
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/mtd/spi-nor/fsl-quadspi.c
View File

@ -269,7 +269,7 @@ struct fsl_qspi {
struct clk *clk, *clk_en; struct clk *clk, *clk_en;
struct device *dev; struct device *dev;
struct completion c; struct completion c;
struct fsl_qspi_devtype_data *devtype_data; const struct fsl_qspi_devtype_data *devtype_data;
u32 nor_size; u32 nor_size;
u32 nor_num; u32 nor_num;
u32 clk_rate; u32 clk_rate;
@ -933,8 +933,6 @@ static int fsl_qspi_probe(struct platform_device *pdev)
struct spi_nor *nor; struct spi_nor *nor;
struct mtd_info *mtd; struct mtd_info *mtd;
int ret, i = 0; int ret, i = 0;
const struct of_device_id *of_id =
of_match_device(fsl_qspi_dt_ids, &pdev->dev);
q = devm_kzalloc(dev, sizeof(*q), GFP_KERNEL); q = devm_kzalloc(dev, sizeof(*q), GFP_KERNEL);
if (!q) if (!q)
@ -945,7 +943,9 @@ static int fsl_qspi_probe(struct platform_device *pdev)
return -ENODEV; return -ENODEV;
q->dev = dev; q->dev = dev;
q->devtype_data = (struct fsl_qspi_devtype_data *)of_id->data; q->devtype_data = of_device_get_match_data(dev);
if (!q->devtype_data)
return -ENODEV;
platform_set_drvdata(pdev, q); platform_set_drvdata(pdev, q);
/* find the resources */ /* find the resources */