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 <[email protected]>
---
 routing.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

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 =
-- 
1.7.2.3

Reply via email to