[commits] linux integration; branch, linux, updated. v2.6.36-rc3-499-g10aead7

postmaster at open-mesh.net postmaster at open-mesh.net
Sun Sep 12 23:04:31 CEST 2010


The following commit has been merged in the linux branch:
commit 10aead75b0ba9e53d872d4f24012c17c405a9433
Author: Sven Eckelmann <sven.eckelmann at gmx.de>
Date:   Sun Sep 12 22:51:04 2010 +0200

    Staging: 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/drivers/staging/batman-adv/routing.c b/drivers/staging/batman-adv/routing.c
index e545260..2cf8cf9 100644
--- a/drivers/staging/batman-adv/routing.c
+++ b/drivers/staging/batman-adv/routing.c
@@ -1232,9 +1232,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 =

-- 
linux integration


More information about the commits mailing list