Changeset f1a8c23 in mainline

Timestamp:

2014-06-29T22:11:05Z (10 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

1bdf307d

Parents:

ef1ddad

Message:

Fix leak of inet dgram.data in TCP, should be freed by inet_ev_recv().

Location:

uspace

Files:

• lib/c/generic/inet.c (modified) (3 diffs)
• srv/net/udp/udp_inet.c (modified) (1 diff)

uspace/lib/c/generic/inet.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2012 Jiri Svoboda
+ * Copyright (c) 2013 Jiri Svoboda
  * All rights reserved.
  *
@@ -34 +34 @@
 #include <ipc/services.h>
 #include <loc.h>
+#include <stdlib.h>
 
 static void inet_cb_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg);
@@ -224 +225 @@
         
         rc = inet_ev_ops->recv(&dgram);
+        free(dgram.data);
         async_answer_0(iid, rc);
 }

uspace/srv/net/udp/udp_inet.c

@@ -71 +71 @@
 
         udp_received_pdu(pdu);
+
+        /* We don't want udp_pdu_delete() to free dgram->data */
+        pdu->data = NULL;
         udp_pdu_delete(pdu);