From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from b.ns.miles-group.at ([95.130.255.144] helo=radon.swed.at)
 by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux))
 id 1W8VDD-0002cB-Qe
 for linux-mtd@lists.infradead.org; Wed, 29 Jan 2014 13:29:53 +0000
Message-ID: <52E90237.1050005@nod.at>
Date: Wed, 29 Jan 2014 14:29:27 +0100
From: Richard Weinberger <richard@nod.at>
MIME-Version: 1.0
To: Dan Carpenter <dan.carpenter@oracle.com>
Subject: Re: [patch] UBI: fix some use after free bugs
References: <20140129131756.GC10678@elgon.mountain>
In-Reply-To: <20140129131756.GC10678@elgon.mountain>
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Cc: linux-mtd@lists.infradead.org, kernel-janitors@vger.kernel.org,
 Brian Norris <computersforpeace@gmail.com>,
 David Woodhouse <dwmw2@infradead.org>, Artem Bityutskiy <dedekind1@gmail.com>
List-Id: Linux MTD discussion mailing list <linux-mtd.lists.infradead.org>
List-Unsubscribe: <http://lists.infradead.org/mailman/options/linux-mtd>,
 <mailto:linux-mtd-request@lists.infradead.org?subject=unsubscribe>
List-Archive: <http://lists.infradead.org/pipermail/linux-mtd/>
List-Post: <mailto:linux-mtd@lists.infradead.org>
List-Help: <mailto:linux-mtd-request@lists.infradead.org?subject=help>
List-Subscribe: <http://lists.infradead.org/mailman/listinfo/linux-mtd>,
 <mailto:linux-mtd-request@lists.infradead.org?subject=subscribe>

Am 29.01.2014 14:17, schrieb Dan Carpenter:
> Move the kmem_cache_free() calls down a couple lines.
> 
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

Thanks for fixing this Dan!

Acked-by: Richard Weinberger <richard@nod.at>

> diff --git a/drivers/mtd/ubi/fastmap.c b/drivers/mtd/ubi/fastmap.c
> index ead861307b3c..c5dad652614d 100644
> --- a/drivers/mtd/ubi/fastmap.c
> +++ b/drivers/mtd/ubi/fastmap.c
> @@ -463,8 +463,8 @@ static int scan_pool(struct ubi_device *ubi, struct ubi_attach_info *ai,
>  				}
>  			}
>  			if (found_orphan) {
> -				kmem_cache_free(ai->aeb_slab_cache, tmp_aeb);
>  				list_del(&tmp_aeb->u.list);
> +				kmem_cache_free(ai->aeb_slab_cache, tmp_aeb);
>  			}
>  
>  			new_aeb = kmem_cache_alloc(ai->aeb_slab_cache,
> @@ -846,16 +846,16 @@ fail_bad:
>  	ret = UBI_BAD_FASTMAP;
>  fail:
>  	list_for_each_entry_safe(tmp_aeb, _tmp_aeb, &used, u.list) {
> -		kmem_cache_free(ai->aeb_slab_cache, tmp_aeb);
>  		list_del(&tmp_aeb->u.list);
> +		kmem_cache_free(ai->aeb_slab_cache, tmp_aeb);
>  	}
>  	list_for_each_entry_safe(tmp_aeb, _tmp_aeb, &eba_orphans, u.list) {
> -		kmem_cache_free(ai->aeb_slab_cache, tmp_aeb);
>  		list_del(&tmp_aeb->u.list);
> +		kmem_cache_free(ai->aeb_slab_cache, tmp_aeb);
>  	}
>  	list_for_each_entry_safe(tmp_aeb, _tmp_aeb, &free, u.list) {
> -		kmem_cache_free(ai->aeb_slab_cache, tmp_aeb);
>  		list_del(&tmp_aeb->u.list);
> +		kmem_cache_free(ai->aeb_slab_cache, tmp_aeb);
>  	}
>  
>  	return ret;
>