Skip to content

Commit

Permalink
mtd: nand: sunxi: prevent a small memory leak
Browse files Browse the repository at this point in the history
I moved the sanity check on ecc->size before the allocation so that we
don't leak memory on error.

Fixes: 05af074a4b73 ('mtd: nand: sunxi: check ecc->size values')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
  • Loading branch information
Dan Carpenter authored and Boris Brezillon committed Jul 11, 2016
1 parent ab9d6a7 commit 40297e7
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/mtd/nand/sunxi_nand.c
Original file line number Diff line number Diff line change
Expand Up @@ -1814,13 +1814,13 @@ static int sunxi_nand_hw_common_ecc_ctrl_init(struct mtd_info *mtd,
int ret;
int i;

if (ecc->size != 512 && ecc->size != 1024)
return -EINVAL;

data = kzalloc(sizeof(*data), GFP_KERNEL);
if (!data)
return -ENOMEM;

if (ecc->size != 512 && ecc->size != 1024)
return -EINVAL;

/* Prefer 1k ECC chunk over 512 ones */
if (ecc->size == 512 && mtd->writesize > 512) {
ecc->size = 1024;
Expand Down

0 comments on commit 40297e7

Please sign in to comment.