summaryrefslogtreecommitdiff
path: root/src/ipcpd/normal/fmgr.c
diff options
context:
space:
mode:
authorSander Vrijders <sander.vrijders@ugent.be>2017-03-25 12:20:05 +0100
committerSander Vrijders <sander.vrijders@ugent.be>2017-03-25 12:24:12 +0100
commit0bbd4b30d618acd50bf2d6d09facf3e5f814e4ff (patch)
treead1dec3d3cc797918188763381a3b91e206479b0 /src/ipcpd/normal/fmgr.c
parent1d9061666656ba1cc5a5c72fcc564a3a45b2dd8a (diff)
downloadouroboros-0bbd4b30d618acd50bf2d6d09facf3e5f814e4ff.tar.gz
ouroboros-0bbd4b30d618acd50bf2d6d09facf3e5f814e4ff.zip
ipcpd: normal: Avoid double free
The flow manager should clean up the buffer after the call to frct create instance has either failed or succeeded.
Diffstat (limited to 'src/ipcpd/normal/fmgr.c')
-rw-r--r--src/ipcpd/normal/fmgr.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/ipcpd/normal/fmgr.c b/src/ipcpd/normal/fmgr.c
index 8cefd317..d2966d0c 100644
--- a/src/ipcpd/normal/fmgr.c
+++ b/src/ipcpd/normal/fmgr.c
@@ -489,11 +489,13 @@ int fmgr_np1_alloc(int fd,
cep_id = frct_i_create(addr, &buf, cube);
if (cep_id == INVALID_CEP_ID) {
- free(buf.data);
pthread_rwlock_unlock(&fmgr.np1_flows_lock);
+ free(buf.data);
return -1;
}
+ free(buf->data);
+
fmgr.np1_fd_to_cep_id[fd] = cep_id;
fmgr.np1_cep_id_to_fd[cep_id] = fd;
@@ -721,14 +723,12 @@ int fmgr_nm1_write_buf(struct pci * pci,
fd = pff_nhop(fmgr.pff[pci->qos_id], pci->dst_addr);
if (fd < 0) {
log_err("Could not get nhop for address %lu", pci->dst_addr);
- free(buf->data);
return -1;
}
buffer = shm_pci_ser_buf(buf, pci);
if (buffer == NULL) {
log_err("Failed to serialize buffer.");
- free(buf->data);
return -1;
}