diff options
| author | Dimitri Staessens <dimitri.staessens@ugent.be> | 2018-12-27 17:25:48 +0100 |
|---|---|---|
| committer | Sander Vrijders <sander.vrijders@ugent.be> | 2018-12-29 10:43:31 +0100 |
| commit | 93c588892a86333fc3cfa66b7c5da2e7ff4e7e6c (patch) | |
| tree | 081ca57d5d9e47bf1c3e8cfa5b2719388558d5bf /src/ipcpd/normal | |
| parent | 9dab3985812e75071271ce69000561156d0d9374 (diff) | |
| download | ouroboros-93c588892a86333fc3cfa66b7c5da2e7ff4e7e6c.tar.gz ouroboros-93c588892a86333fc3cfa66b7c5da2e7ff4e7e6c.zip | |
lib: Fix deallocating non-initialized np1 flows
This fixes the deallocation of non-initialized IPCP flows. These can
occur when some operations are not implemented.
Signed-off-by: Dimitri Staessens <dimitri.staessens@ugent.be>
Signed-off-by: Sander Vrijders <sander.vrijders@ugent.be>
Diffstat (limited to 'src/ipcpd/normal')
| -rw-r--r-- | src/ipcpd/normal/fa.c | 3 | ||||
| -rw-r--r-- | src/ipcpd/normal/psched.c | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/ipcpd/normal/fa.c b/src/ipcpd/normal/fa.c index 56864e1f..8408033f 100644 --- a/src/ipcpd/normal/fa.c +++ b/src/ipcpd/normal/fa.c @@ -446,7 +446,8 @@ int fa_alloc_resp(int fd, int fa_dealloc(int fd) { - ipcp_flow_fini(fd); + if (ipcp_flow_fini(fd) < 0) + return 0; pthread_rwlock_wrlock(&fa.flows_lock); diff --git a/src/ipcpd/normal/psched.c b/src/ipcpd/normal/psched.c index c38c072d..6d02de18 100644 --- a/src/ipcpd/normal/psched.c +++ b/src/ipcpd/normal/psched.c @@ -217,7 +217,7 @@ void psched_destroy(struct psched * psched) } void psched_add(struct psched * psched, - int fd) + int fd) { qoscube_t qc; @@ -228,7 +228,7 @@ void psched_add(struct psched * psched, } void psched_del(struct psched * psched, - int fd) + int fd) { qoscube_t qc; |