[commits] batman-adv; branch, master, updated. v2010.1.0-160-gbcf914f

postmaster at open-mesh.net postmaster at open-mesh.net
Sun Sep 12 23:27:36 CEST 2010


The following commit has been merged in the master branch:
commit bcf914f2d21ac9cad80ef8e7763c4757ec0b806c
Author: Sven Eckelmann <sven.eckelmann at gmx.de>
Date:   Sun Sep 12 21:27:21 2010 +0000

    batman-adv: Unlock on failure during fragmentation rx
    
    When we detect a failure in create_frag_buffer we must drop the packet
    and unlock the orig_has which was locked before.
    69d187ffb8e22024a87d8457e5dcb10e297108e9 forgot that and created a
    potential deadlock of the complete system.
    
    Signed-off-by: Sven Eckelmann <sven.eckelmann at gmx.de>

diff --git a/routing.c b/routing.c
index e09a231..603a932 100644
--- a/routing.c
+++ b/routing.c
@@ -1244,9 +1244,11 @@ int recv_ucast_frag_packet(struct sk_buff *skb, struct batman_if *recv_if)
 
 		orig_node->last_frag_packet = jiffies;
 
-		if (list_empty(&orig_node->frag_list)) {
-			if (create_frag_buffer(&orig_node->frag_list))
-				return NET_RX_DROP;
+		if (list_empty(&orig_node->frag_list) &&
+			create_frag_buffer(&orig_node->frag_list)) {
+			spin_unlock_irqrestore(&bat_priv->orig_hash_lock,
+					       flags);
+			return NET_RX_DROP;
 		}
 
 		tmp_frag_entry =

-- 
batman-adv


More information about the commits mailing list