[linux-next] LinuxNextTracking branch, master, updated. next-20120810

batman at open-mesh.org batman at open-mesh.org
Sat Aug 11 00:15:55 CEST 2012


The following commit has been merged in the master branch:
commit 155e4e12b9f49c2dc817bb4c44e9416c46833c3d
Author: Jesper Juhl <jj at chaosbits.net>
Date:   Tue Aug 7 08:32:34 2012 +0000

    batman-adv: Fix mem leak in the batadv_tt_local_event() function
    
    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 <jj at chaosbits.net>
    Acked-by: Antonio Quartulli <ordex at autistici.org>
    Signed-off-by: David S. Miller <davem at davemloft.net>

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;
 	}

-- 
LinuxNextTracking


More information about the linux-merge mailing list