summaryrefslogtreecommitdiff
path: root/src/daemon/dlt_daemon_connection.c
diff options
context:
space:
mode:
authorFrederic Berat <fberat@de.adit-jv.com>2017-01-17 11:37:27 +0100
committerChristoph Lipka <clipka@jp.adit-jv.com>2017-02-01 12:14:55 +0900
commit0ce6e68d8835b13aa6be52ffdf2d81e1170a3834 (patch)
treea61dd79be59d2346be0c3614ed1f062f1ca147e2 /src/daemon/dlt_daemon_connection.c
parent03dce720baf91ff67eb82431f8d6ad24b4f4d657 (diff)
downloadDLT-daemon-0ce6e68d8835b13aa6be52ffdf2d81e1170a3834.tar.gz
dlt-daemon: Fix use after free potential issue
In dlt_daemon_send_all_multiple, if the connection was broken, we closed it before getting the next available connection. This must be avoided by having a temporary next pointer. The same kind of problem is valid for pointers coming from the epoll interface. The kernel can provide back connection pointer that are not valid any longer. Therefore, we need to use an ID instead of the pointer value to retrieve the connections. Signed-off-by: Frederic Berat <fberat@de.adit-jv.com> Signed-off-by: Christoph Lipka <clipka@jp.adit-jv.com>
Diffstat (limited to 'src/daemon/dlt_daemon_connection.c')
-rw-r--r--src/daemon/dlt_daemon_connection.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/src/daemon/dlt_daemon_connection.c b/src/daemon/dlt_daemon_connection.c
index b22f4b7..8d2aa67 100644
--- a/src/daemon/dlt_daemon_connection.c
+++ b/src/daemon/dlt_daemon_connection.c
@@ -47,6 +47,8 @@
#include "dlt_common.h"
#include "dlt_gateway.h"
+static DltConnectionId connectionId;
+
/** @brief Generic sending function.
*
* We manage different type of connection which have similar send/write
@@ -319,6 +321,7 @@ void *dlt_connection_get_callback(DltConnection *con)
*/
void dlt_connection_destroy(DltConnection *to_destroy)
{
+ to_destroy->id = 0;
close(to_destroy->receiver->fd);
dlt_connection_destroy_receiver(to_destroy);
/* connection pointer might be in epoll queue and used even after destroying
@@ -388,6 +391,14 @@ int dlt_connection_create(DltDaemonLocal *daemon_local,
return -1;
}
+ /* We are single threaded no need for protection. */
+ temp->id = connectionId++;
+ if (!temp->id)
+ {
+ /* Skipping 0 */
+ temp->id = connectionId++;
+ }
+
temp->type = type;
temp->status = ACTIVE;