From patchwork Tue Aug 7 18:32:34 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jesper Juhl X-Patchwork-Id: 175767 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id F17CC2C0087 for ; Wed, 8 Aug 2012 04:32:50 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752081Ab2HGScg (ORCPT ); Tue, 7 Aug 2012 14:32:36 -0400 Received: from 1010ds2-suoe.0.fullrate.dk ([90.184.90.115]:11720 "EHLO swampdragon.chaosbits.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751132Ab2HGScf (ORCPT ); Tue, 7 Aug 2012 14:32:35 -0400 Received: by swampdragon.chaosbits.net (Postfix, from userid 1000) id 4EBF29403D; Tue, 7 Aug 2012 20:32:34 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by swampdragon.chaosbits.net (Postfix) with ESMTP id 4CDBF9403B; Tue, 7 Aug 2012 20:32:34 +0200 (CEST) Date: Tue, 7 Aug 2012 20:32:34 +0200 (CEST) From: Jesper Juhl To: linux-kernel@vger.kernel.org cc: netdev@vger.kernel.org, b.a.t.m.a.n@lists.open-mesh.org, "David S. Miller" , Antonio Quartulli , Simon Wunderlich , Marek Lindner Subject: [PATCH] batman-adv: Fix mem leak in the batadv_tt_local_event() function Message-ID: User-Agent: Alpine 2.00 (LNX 1167 2008-08-23) MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Memory is allocated for 'tt_change_node' with kmalloc(). 'tt_change_node' may go out of scope really being used for anything (except have a few members initialized) if we hit the 'del:' label. This patch makes sure we free the memory in that case. Signed-off-by: Jesper Juhl Acked-by: Antonio Quartulli --- net/batman-adv/translation-table.c | 1 + 1 file changed, 1 insertion(+) Compile tested only. diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index a438f4b..99dd8f7 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -197,6 +197,7 @@ static void batadv_tt_local_event(struct batadv_priv *bat_priv, del: list_del(&entry->list); kfree(entry); + kfree(tt_change_node); event_removed = true; goto unlock; }