From: Florin Malita Date: Thu, 19 Jul 2007 19:22:41 +0000 (-0400) Subject: UBI: fix leak in ubi_scan_erase_peb X-Git-Tag: v2.6.24-rc1~1324^2^2~10 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=dcec4c3bdc4d5f4bd2d858ee1ce11e3424cbaed7;p=linux-2.6-omap-h63xx.git UBI: fix leak in ubi_scan_erase_peb Coverity (1769) found the following problem: if the erase counter overflow check triggers, ec_hdr is leaked. Moving the allocation after the overflow check should take care of it. Signed-off-by: Florin Malita Signed-off-by: Artem Bityutskiy --- diff --git a/drivers/mtd/ubi/scan.c b/drivers/mtd/ubi/scan.c index 94ee5493441..80c73d88c83 100644 --- a/drivers/mtd/ubi/scan.c +++ b/drivers/mtd/ubi/scan.c @@ -673,10 +673,6 @@ int ubi_scan_erase_peb(const struct ubi_device *ubi, int err; struct ubi_ec_hdr *ec_hdr; - ec_hdr = kzalloc(ubi->ec_hdr_alsize, GFP_KERNEL); - if (!ec_hdr) - return -ENOMEM; - if ((long long)ec >= UBI_MAX_ERASECOUNTER) { /* * Erase counter overflow. Upgrade UBI and use 64-bit @@ -686,6 +682,10 @@ int ubi_scan_erase_peb(const struct ubi_device *ubi, return -EINVAL; } + ec_hdr = kzalloc(ubi->ec_hdr_alsize, GFP_KERNEL); + if (!ec_hdr) + return -ENOMEM; + ec_hdr->ec = cpu_to_be64(ec); err = ubi_io_sync_erase(ubi, pnum, 0);