diff options
| author | Sander Vrijders <sander.vrijders@intec.ugent.be> | 2016-10-27 14:37:43 +0000 |
|---|---|---|
| committer | Sander Vrijders <sander.vrijders@intec.ugent.be> | 2016-10-27 14:37:43 +0000 |
| commit | 98547bfbd57b8824d38a3a5cdb2dd10bc8f5f187 (patch) | |
| tree | 34c95b327e20763a2d33956344d0bfc4bc7405be | |
| parent | 98f6ab88208a71fb0eed578f0a9a87d578c44f93 (diff) | |
| parent | 82cf68254614a70a22d4b1b08b5bb2ba96c9dbd7 (diff) | |
| download | ouroboros-98547bfbd57b8824d38a3a5cdb2dd10bc8f5f187.tar.gz ouroboros-98547bfbd57b8824d38a3a5cdb2dd10bc8f5f187.zip | |
Merged in dstaesse/ouroboros/be-udp (pull request #287)
ipcpd: Fix bad lock in shim-udp
| -rw-r--r-- | src/ipcpd/shim-udp/main.c | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/src/ipcpd/shim-udp/main.c b/src/ipcpd/shim-udp/main.c index e4ab4fac..c90b47a2 100644 --- a/src/ipcpd/shim-udp/main.c +++ b/src/ipcpd/shim-udp/main.c @@ -272,6 +272,7 @@ static int ipcp_udp_port_req(struct sockaddr_in * c_saddr, } pthread_rwlock_rdlock(&ipcpi.state_lock); + pthread_rwlock_wrlock(&udp_data.flows_lock); /* reply to IRM */ fd = ipcp_flow_req_arr(getpid(), dst_name, src_ae_name); @@ -283,8 +284,6 @@ static int ipcp_udp_port_req(struct sockaddr_in * c_saddr, return -1; } - pthread_rwlock_wrlock(&udp_data.flows_lock); - udp_data.uf_to_fd[skfd] = fd; udp_data.fd_to_uf[fd].skfd = skfd; udp_data.fd_to_uf[fd].udp = f_saddr.sin_port; @@ -494,19 +493,16 @@ static void * ipcp_udp_sdu_loop(void * o) pthread_rwlock_rdlock(&ipcpi.state_lock); pthread_rwlock_rdlock(&udp_data.flows_lock); - fd = udp_data.fd_to_uf[fd].skfd; - - pthread_rwlock_unlock(&udp_data.flows_lock); - pthread_rwlock_unlock(&ipcpi.state_lock); - - if (send(fd, + if (send(udp_data.fd_to_uf[fd].skfd, shm_du_buff_head(sdb), shm_du_buff_tail(sdb) - shm_du_buff_head(sdb), 0) < 0) LOG_ERR("Failed to send SDU."); - ipcp_flow_del(sdb); - } + pthread_rwlock_unlock(&udp_data.flows_lock); + pthread_rwlock_unlock(&ipcpi.state_lock); + + ipcp_flow_del(sdb); } } return (void *) 1; @@ -1119,10 +1115,13 @@ static int ipcp_udp_flow_dealloc(int fd) clr_fd(skfd); pthread_rwlock_unlock(&udp_data.flows_lock); - pthread_rwlock_unlock(&ipcpi.state_lock); + pthread_rwlock_wrlock(&udp_data.flows_lock); close(skfd); + pthread_rwlock_unlock(&udp_data.flows_lock); + pthread_rwlock_unlock(&ipcpi.state_lock); + flow_dealloc(fd); LOG_DBG("Flow with fd %d deallocated.", fd); |