diff options
| author | Tobias Heider <tobhe@cvs.openbsd.org> | 2021-09-06 13:29:18 +0000 |
|---|---|---|
| committer | Tobias Heider <tobhe@cvs.openbsd.org> | 2021-09-06 13:29:18 +0000 |
| commit | 2b0390da42afe73f604d72f63adf5699da8b9d3f (patch) | |
| tree | 1292354dbff9e9b9cf406e57a553f44414b92240 /sbin | |
| parent | 39e430e98b4b561a9f2f2aca819ddda14f808e46 (diff) | |
Fix leaks in vroute addr and route caches.
ok patrick@
Diffstat (limited to 'sbin')
| -rw-r--r-- | sbin/iked/vroute.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/sbin/iked/vroute.c b/sbin/iked/vroute.c index b893da81315..1f2318939e4 100644 --- a/sbin/iked/vroute.c +++ b/sbin/iked/vroute.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vroute.c,v 1.13 2021/09/01 15:30:06 tobhe Exp $ */ +/* $OpenBSD: vroute.c,v 1.14 2021/09/06 13:29:17 tobhe Exp $ */ /* * Copyright (c) 2021 Tobias Heider <tobhe@openbsd.org> @@ -401,9 +401,9 @@ vroute_removeroute(struct iked *env, int rdomain, struct sockaddr *dest, struct sockaddr *mask) { struct iked_vroute_sc *ivr = env->sc_vroute; - struct vroute_route *route; + struct vroute_route *route, *troute; - TAILQ_FOREACH(route, &ivr->ivr_routes, vr_entry) { + TAILQ_FOREACH_SAFE(route, &ivr->ivr_routes, vr_entry, troute) { if (sockaddr_cmp(dest, (struct sockaddr *)&route->vr_dest, -1)) continue; if (mask && !(route->vr_flags & RTA_NETMASK)) @@ -414,6 +414,7 @@ vroute_removeroute(struct iked *env, int rdomain, struct sockaddr *dest, if (rdomain != route->vr_rdomain) continue; TAILQ_REMOVE(&ivr->ivr_routes, route, vr_entry); + free(route); } } @@ -469,9 +470,9 @@ vroute_removeaddr(struct iked *env, int ifidx, struct sockaddr *addr, struct sockaddr *mask) { struct iked_vroute_sc *ivr = env->sc_vroute; - struct vroute_addr *vaddr; + struct vroute_addr *vaddr, *tvaddr; - TAILQ_FOREACH(vaddr, &ivr->ivr_addrs, va_entry) { + TAILQ_FOREACH_SAFE(vaddr, &ivr->ivr_addrs, va_entry, tvaddr) { if (sockaddr_cmp(addr, (struct sockaddr *)&vaddr->va_addr, -1)) continue; if (sockaddr_cmp(mask, (struct sockaddr *)&vaddr->va_mask, -1)) @@ -479,6 +480,7 @@ vroute_removeaddr(struct iked *env, int ifidx, struct sockaddr *addr, if (ifidx != vaddr->va_ifidx) continue; TAILQ_REMOVE(&ivr->ivr_addrs, vaddr, va_entry); + free(vaddr); } } |