From: Roy Marples <roy@marples.name>
Date: Tue, 20 Jan 2015 11:41:46 +0000 (+0000)
Subject: Ensure memory is freed when forking.
X-Git-Tag: v6.7.0~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0e176027029613da9f7bb4ebf0bf82c8a2a8edb1;p=thirdparty%2Fdhcpcd.git

Ensure memory is freed when forking.
---

diff --git a/ipv6.c b/ipv6.c
index ebd3e626..bb17cb37 100644
--- a/ipv6.c
+++ b/ipv6.c
@@ -835,16 +835,13 @@ ipv6_freedrop_addrs(struct ipv6_addrhead *addrs, int drop,
 	TAILQ_FOREACH_SAFE(ap, addrs, next, apn) {
 		if (ifd && ap->delegating_iface != ifd)
 			continue;
-		if (drop != 2)
-			TAILQ_REMOVE(addrs, ap, next);
+		TAILQ_REMOVE(addrs, ap, next);
 		eloop_q_timeout_delete(ap->iface->ctx->eloop, 0, NULL, ap);
 		if (drop && ap->flags & IPV6_AF_ADDED &&
 		    (ap->iface->options->options &
 		    (DHCPCD_EXITING | DHCPCD_PERSISTENT)) !=
 		    (DHCPCD_EXITING | DHCPCD_PERSISTENT))
 		{
-			if (drop == 2)
-				TAILQ_REMOVE(addrs, ap, next);
 			/* Find the same address somewhere else */
 			apf = ipv6_findaddr(ap->iface->ctx, &ap->addr, 0);
 			if (apf == NULL ||
@@ -858,11 +855,8 @@ ipv6_freedrop_addrs(struct ipv6_addrhead *addrs, int drop,
 					get_monotonic(&now);
 				ipv6_addaddr(apf, &now);
 			}
-			if (drop == 2)
-				free(ap);
 		}
-		if (drop != 2)
-			free(ap);
+		free(ap);
 	}
 }
 
@@ -1240,7 +1234,7 @@ ipv6_freedrop(struct interface *ifp, int drop)
 				TAILQ_REMOVE(&state->ll_callbacks, cb, next);
 				free(cb);
 			}
-			ipv6_freedrop_addrs(&state->addrs, drop ? 2 : 0, NULL);
+			ipv6_freedrop_addrs(&state->addrs, drop, NULL);
 			free(state);
 			ifp->if_data[IF_DATA_IPV6] = NULL;
 			eloop_timeout_delete(ifp->ctx->eloop, NULL, ifp);
@@ -1251,10 +1245,15 @@ ipv6_freedrop(struct interface *ifp, int drop)
 void
 ipv6_ctxfree(struct dhcpcd_ctx *ctx)
 {
+	struct rt6 *rt;
 
 	if (ctx->ipv6 == NULL)
 		return;
 
+	while ((rt = TAILQ_FIRST(ctx->ipv6->routes))) {
+		TAILQ_REMOVE(ctx->ipv6->routes, rt, next);
+		free(rt);
+	}
 	free(ctx->ipv6->routes);
 	free(ctx->ipv6->ra_routers);
 	free(ctx->ipv6);