diff mbox

batman-adv: Unlock on failure during fragmentation rx

Message ID 1284325242-29661-1-git-send-email-sven.eckelmann@gmx.de (mailing list archive)
State Accepted, archived
Commit 2bb3ae213d0ee251273622ee0720efc3692d1fd4
Headers

Commit Message

Sven Eckelmann Sept. 12, 2010, 9 p.m. UTC 
  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>
---
 routing.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

Comments

Marek Lindner Sept. 12, 2010, 9:28 p.m. UTC | #1 
On Sunday 12 September 2010 23:00:42 Sven Eckelmann wrote:
> 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>

Good catch - applied in revision 1791.

Thanks,
Marek
diff mbox

Patch

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 =