[ch2857] Fixed deadlock in IPv4 frag handling.

cybermaggedon · Feb 22, 2018 · 46d1a95 · 46d1a95
1 parent 3713bb5
commit 46d1a95
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/configure.ac b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.68])
-AC_INIT([cyberprobe], [1.9.8], [[email protected]])
+AC_INIT([cyberprobe], [1.9.9], [[email protected]])
 AM_INIT_AUTOMAKE([-Wall -Werror])
 AC_CONFIG_SRCDIR([src/target.h])
 AC_CONFIG_HEADERS([config.h])

diff --git a/src/ip.C b/src/ip.C
@@ -212,12 +212,13 @@ void ip::process_ip4(manager& mgr, context_ptr c, const pdu_slice& sl)
 	    fc->f_list.erase(id);
 	    fc->hdrs_list.erase(id);
 
+	    // Need to unlock, because the re-entrant call will take the lock.
+	    fc->lock.unlock();
+
 	    // We now have a complete IP packet!  Process it.
 	    ip::process_ip4(mgr, c,
 			    pdu_slice(pdu.begin(), pdu.end(), sl.time));
 
-	    fc->lock.unlock();
-
 	    return;
 
 	} else {