The following commit has been merged in the next branch: commit 2bb3ae213d0ee251273622ee0720efc3692d1fd4 Author: Sven Eckelmann sven.eckelmann@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@gmx.de

diff --git a/routing.c b/routing.c index 23a12cd..a07e0e0 100644 --- a/routing.c +++ b/routing.c @@ -1233,9 +1233,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 =