Skip to content

Commit

Permalink
soc: fsl: guts: Add a NULL check for devm_kasprintf()
Browse files Browse the repository at this point in the history
devm_kasprintf() may fail, so we should better add a NULL check
and propagate an error on failure.

Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
Acked-by: Yangbo Lu <yangbo.lu@nxp.com>
Signed-off-by: Li Yang <leoyang.li@nxp.com>
  • Loading branch information
Fabio Estevam authored and Li Yang committed Jan 22, 2018
1 parent 6ea0acf commit 14b055f
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions drivers/soc/fsl/guts.c
Original file line number Diff line number Diff line change
Expand Up @@ -167,10 +167,16 @@ static int fsl_guts_probe(struct platform_device *pdev)
} else {
soc_dev_attr.family = devm_kasprintf(dev, GFP_KERNEL, "QorIQ");
}
if (!soc_dev_attr.family)
return -ENOMEM;
soc_dev_attr.soc_id = devm_kasprintf(dev, GFP_KERNEL,
"svr:0x%08x", svr);
if (!soc_dev_attr.soc_id)
return -ENOMEM;
soc_dev_attr.revision = devm_kasprintf(dev, GFP_KERNEL, "%d.%d",
(svr >> 4) & 0xf, svr & 0xf);
if (!soc_dev_attr.revision)
return -ENOMEM;

soc_dev = soc_device_register(&soc_dev_attr);
if (IS_ERR(soc_dev))
Expand Down

0 comments on commit 14b055f

Please sign in to comment.