diff mbox series

[2/2] mtd: brcmnand: Add a NULL check for devm_kasprintf()

Message ID 1515182576-2704-2-git-send-email-festevam@gmail.com
State Accepted
Delegated to: Boris Brezillon
Headers show
Series None | expand

Commit Message

Fabio Estevam Jan. 5, 2018, 8:02 p.m. UTC 
From: Fabio Estevam <fabio.estevam@nxp.com>

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>
---
 drivers/mtd/nand/brcmnand/brcmnand.c | 2 ++
 1 file changed, 2 insertions(+)

Comments

Boris Brezillon Jan. 6, 2018, 9:35 a.m. UTC | #1 
Hi Fabio,

The prefix should be "mtd: nand: brcmnand: ".

No need to resend, I'll fix it when applying.

Thanks,

Boris

On Fri,  5 Jan 2018 18:02:56 -0200
Fabio Estevam <festevam@gmail.com> wrote:

> From: Fabio Estevam <fabio.estevam@nxp.com>
> 
> 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>
> ---
>  drivers/mtd/nand/brcmnand/brcmnand.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/drivers/mtd/nand/brcmnand/brcmnand.c b/drivers/mtd/nand/brcmnand/brcmnand.c
> index 3310e14..8942aa6 100644
> --- a/drivers/mtd/nand/brcmnand/brcmnand.c
> +++ b/drivers/mtd/nand/brcmnand/brcmnand.c
> @@ -2237,6 +2237,8 @@ static int brcmnand_init_cs(struct brcmnand_host *host, struct device_node *dn)
>  	nand_set_controller_data(chip, host);
>  	mtd->name = devm_kasprintf(&pdev->dev, GFP_KERNEL, "brcmnand.%d",
>  				   host->cs);
> +	if (!mtd->name)
> +		return -ENOMEM;
>  	mtd->owner = THIS_MODULE;
>  	mtd->dev.parent = &pdev->dev;
>
Boris Brezillon Jan. 6, 2018, 8:40 p.m. UTC | #2 
On Sat, 6 Jan 2018 10:35:57 +0100
Boris Brezillon <boris.brezillon@free-electrons.com> wrote:

> Hi Fabio,
> 
> The prefix should be "mtd: nand: brcmnand: ".
> 
> No need to resend, I'll fix it when applying.
> 
> Thanks,
> 
> Boris
> 
> On Fri,  5 Jan 2018 18:02:56 -0200
> Fabio Estevam <festevam@gmail.com> wrote:
> 
> > From: Fabio Estevam <fabio.estevam@nxp.com>
> > 
> > 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>

Applied.

Thanks,

Boris

> > ---
> >  drivers/mtd/nand/brcmnand/brcmnand.c | 2 ++
> >  1 file changed, 2 insertions(+)
> > 
> > diff --git a/drivers/mtd/nand/brcmnand/brcmnand.c b/drivers/mtd/nand/brcmnand/brcmnand.c
> > index 3310e14..8942aa6 100644
> > --- a/drivers/mtd/nand/brcmnand/brcmnand.c
> > +++ b/drivers/mtd/nand/brcmnand/brcmnand.c
> > @@ -2237,6 +2237,8 @@ static int brcmnand_init_cs(struct brcmnand_host *host, struct device_node *dn)
> >  	nand_set_controller_data(chip, host);
> >  	mtd->name = devm_kasprintf(&pdev->dev, GFP_KERNEL, "brcmnand.%d",
> >  				   host->cs);
> > +	if (!mtd->name)
> > +		return -ENOMEM;
> >  	mtd->owner = THIS_MODULE;
> >  	mtd->dev.parent = &pdev->dev;
> >    
> 
> 
> ______________________________________________________
> Linux MTD discussion mailing list
> http://lists.infradead.org/mailman/listinfo/linux-mtd/
diff mbox series

Patch

diff --git a/drivers/mtd/nand/brcmnand/brcmnand.c b/drivers/mtd/nand/brcmnand/brcmnand.c
index 3310e14..8942aa6 100644
--- a/drivers/mtd/nand/brcmnand/brcmnand.c
+++ b/drivers/mtd/nand/brcmnand/brcmnand.c
@@ -2237,6 +2237,8 @@  static int brcmnand_init_cs(struct brcmnand_host *host, struct device_node *dn)
 	nand_set_controller_data(chip, host);
 	mtd->name = devm_kasprintf(&pdev->dev, GFP_KERNEL, "brcmnand.%d",
 				   host->cs);
+	if (!mtd->name)
+		return -ENOMEM;
 	mtd->owner = THIS_MODULE;
 	mtd->dev.parent = &pdev->dev;