From 0f30eaa3d4dd573f9af30a9fd0c5d22bad63c560 Mon Sep 17 00:00:00 2001 From: dimitri staessens Date: Mon, 3 Apr 2017 16:40:46 +0200 Subject: ipcpd: Fix some bad locking --- src/ipcpd/local/main.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'src/ipcpd/local') diff --git a/src/ipcpd/local/main.c b/src/ipcpd/local/main.c index 38a901c0..718c8d7e 100644 --- a/src/ipcpd/local/main.c +++ b/src/ipcpd/local/main.c @@ -229,6 +229,12 @@ static int ipcp_local_flow_alloc(int fd, assert(dst_name); + out_fd = ipcp_flow_req_arr(getpid(), dst_name, cube); + if (out_fd < 0) { + log_dbg("Flow allocation failed."); + return -1; + } + pthread_rwlock_rdlock(&ipcpi.state_lock); if (ipcp_get_state() != IPCP_OPERATIONAL) { @@ -239,14 +245,6 @@ static int ipcp_local_flow_alloc(int fd, pthread_rwlock_wrlock(&local_data.lock); - out_fd = ipcp_flow_req_arr(getpid(), dst_name, cube); - if (out_fd < 0) { - log_dbg("Flow allocation failed."); - pthread_rwlock_unlock(&local_data.lock); - pthread_rwlock_unlock(&ipcpi.state_lock); - return -1; - } - local_data.in_out[fd] = out_fd; local_data.in_out[out_fd] = fd; -- cgit v1.2.3