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

batman at open-mesh.org batman at open-mesh.org
Fri Jun 24 16:08:51 CEST 2011


The following commit has been merged in the master branch:
commit dda9fc6b2c59f056e7a2b313b8423b14a4df25a9
Author: Sven Eckelmann <sven at narfation.org>
Date:   Fri Jan 28 18:34:06 2011 +0100

    batman-adv: Remove vis info element in free_info
    
    The free_info function will be called when no reference to the info
    object exists anymore. It must be ensured that the allocated memory
    gets freed and not only the elements which are managed by the info
    object.
    
    Signed-off-by: Sven Eckelmann <sven at narfation.org>

diff --git a/net/batman-adv/vis.c b/net/batman-adv/vis.c
index 0be55be..988296c 100644
--- a/net/batman-adv/vis.c
+++ b/net/batman-adv/vis.c
@@ -64,6 +64,7 @@ static void free_info(struct kref *ref)
 
 	spin_unlock_bh(&bat_priv->vis_list_lock);
 	kfree_skb(info->skb_packet);
+	kfree(info);
 }
 
 /* Compare two vis packets, used by the hashing algorithm */

-- 
LinuxNextTracking


More information about the linux-merge mailing list