From c0a08d0f7a4b66a030eb0eca0e3f1dc45ff08665 Mon Sep 17 00:00:00 2001
From: Sander Vrijders <sander.vrijders@intec.ugent.be>
Date: Wed, 5 Oct 2016 11:42:59 +0200
Subject: lib, ipcpd: Fix bad locking

Some locks were taken at an inappropriate time, causing the
shim-eth-llc to block indefinitely upon shutdown and causing flow
allocation to halt since a response could never be given.
---
 src/lib/dev.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/lib/dev.c')

diff --git a/src/lib/dev.c b/src/lib/dev.c
index 178ee287..8e1ee342 100644
--- a/src/lib/dev.c
+++ b/src/lib/dev.c
@@ -889,11 +889,11 @@ int np1_flow_resp(pid_t n_api, int port_id)
         int fd;
         struct shm_ap_rbuff * rb;
 
+        port_wait_assign(&ai.ports[port_id]);
+
         pthread_rwlock_rdlock(&ai.data_lock);
         pthread_rwlock_wrlock(&ai.flows_lock);
 
-        port_wait_assign(&ai.ports[port_id]);
-
         fd = ai.ports[port_id].fd;
         if (fd < 0) {
                 pthread_rwlock_unlock(&ai.flows_lock);
-- 
cgit v1.2.3