于 2013年09月17日 09:31, Brian Norris 写道:
> This fixes a memory leak in the ONFI support code for detecting the
> required ECC levels from this commit:
>
> commit 6dcbe0cdd83fb5f77be4f44c9e06c535281c375a
> Author: Huang Shijie <b32...@freescale.com>
> Date: Wed May 22 10:28:27 2013 +0800
>
> mtd: get the ECC info from the Extended Parameter Page
>
> In the success case, we never freed the 'ep' buffer.
>
> Also, this fixes an oversight in the same commit where we (harmlessly)
> freed the NULL pointer.
>
> Signed-off-by: Brian Norris <computersforpe...@gmail.com>
> Cc: Huang Shijie <b32...@freescale.com>
> ---
> David, if there are no objections, can you send this to Linus for 3.12?
>
> If this doesn't make it into 3.12, then it will be -stable material.
>
> drivers/mtd/nand/nand_base.c | 8 +++-----
> 1 file changed, 3 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
> index d4578a1..00022b4 100644
> --- a/drivers/mtd/nand/nand_base.c
> +++ b/drivers/mtd/nand/nand_base.c
> @@ -2869,10 +2869,8 @@ static int nand_flash_detect_ext_param_page(struct
> mtd_info *mtd,
>
> len = le16_to_cpu(p->ext_param_page_length) * 16;
> ep = kmalloc(len, GFP_KERNEL);
> - if (!ep) {
> - ret = -ENOMEM;
> - goto ext_out;
> - }
> + if (!ep)
> + return -ENOMEM;
>
> /* Send our own NAND_CMD_PARAM. */
> chip->cmdfunc(mtd, NAND_CMD_PARAM, 0, -1);
> @@ -2920,7 +2918,7 @@ static int nand_flash_detect_ext_param_page(struct
> mtd_info *mtd,
> }
>
> pr_info("ONFI extended param page detected.\n");
> - return 0;
> + ret = 0;
>
> ext_out:
> kfree(ep);
good catch!
Acked-by: Huang Shijie <b32...@freescale.com>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
