[PATCH RESEND 1/2] mtd: bcm47: convert kzalloc to avoid invalid access

Andy Shevchenko andy.shevchenko at gmail.com
Thu May 30 06:26:11 EDT 2013


On Thu, May 30, 2013 at 5:22 AM, Libo Chen <clbchenlibo.chen at huawei.com> wrote:
> mtd is just member of bcm47xxsflash, so we should free bcm47xxsflash not its member.
> So I use devm_kazlloc instead of kazlloc to avoid it.

You may amend commit message, but technically you have my
Reviewed-by: Andy Shevchenko <andy.shevchenko at gmail.com>

> diff --git a/drivers/mtd/devices/bcm47xxsflash.c b/drivers/mtd/devices/bcm47xxsflash.c
> index 18e7761..2630d5c 100644
> --- a/drivers/mtd/devices/bcm47xxsflash.c
> +++ b/drivers/mtd/devices/bcm47xxsflash.c
> @@ -54,11 +54,9 @@ static int bcm47xxsflash_bcma_probe(struct platform_device *pdev)
>         struct bcm47xxsflash *b47s;
>         int err;
>
> -       b47s = kzalloc(sizeof(*b47s), GFP_KERNEL);
> -       if (!b47s) {
> -               err = -ENOMEM;
> -               goto out;
> -       }
> +       b47s = devm_kzalloc(&pdev->dev, sizeof(*b47s), GFP_KERNEL);
> +       if (!b47s)
> +               return -ENOMEM;
>         sflash->priv = b47s;
>
>         b47s->bcma_cc = container_of(sflash, struct bcma_drv_cc, sflash);
> @@ -81,15 +79,10 @@ static int bcm47xxsflash_bcma_probe(struct platform_device *pdev)
>         err = mtd_device_parse_register(&b47s->mtd, probes, NULL, NULL, 0);
>         if (err) {
>                 pr_err("Failed to register MTD device: %d\n", err);
> -               goto err_dev_reg;
> +               return err;
>         }
>
>         return 0;
> -
> -err_dev_reg:
> -       kfree(&b47s->mtd);
> -out:
> -       return err;
>  }
>
>  static int bcm47xxsflash_bcma_remove(struct platform_device *pdev)
> @@ -98,7 +91,6 @@ static int bcm47xxsflash_bcma_remove(struct platform_device *pdev)
>         struct bcm47xxsflash *b47s = sflash->priv;
>
>         mtd_device_unregister(&b47s->mtd);
> -       kfree(b47s);
>
>         return 0;
>  }
> --
> 1.7.1
>
>



--
With Best Regards,
Andy Shevchenko



More information about the linux-mtd mailing list