Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a memory leak in nat-t keepalive code.

This commit is contained in:
tteras 2009-04-20 13:17:35 +00:00
parent 8c22b469e0
commit 8759a6c72c
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
crypto/dist/ipsec-tools/src/racoon/nattraversal.c vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: nattraversal.c,v 1.9 2009/03/12 10:57:26 tteras Exp $ */
/* $NetBSD: nattraversal.c,v 1.10 2009/04/20 13:17:35 tteras Exp $ */
/*
* Copyright (C) 2004 SuSE Linux AG, Nuernberg, Germany.
@ -325,6 +325,15 @@ natt_handle_vendorid (struct ph1handle *iph1, int vid_numeric)
iph1->natt_flags |= NAT_ANNOUNCED;
}
static void
natt_keepalive_delete (struct natt_ka_addrs *ka)
{
TAILQ_REMOVE (&ka_tree, ka, chain);
racoon_free (ka->src);
racoon_free (ka->dst);
racoon_free (ka);
}
/* NAT keepalive functions */
static void
natt_keepalive_send (struct sched *param)
@ -339,8 +348,7 @@ natt_keepalive_send (struct sched *param)
s = myaddr_getfd(ka->src);
if (s == -1) {
TAILQ_REMOVE (&ka_tree, ka, chain);
racoon_free (ka);
natt_keepalive_delete(ka);
continue;
}
plog (LLV_DEBUG, LOCATION, NULL, "KA: %s\n",
@ -441,8 +449,7 @@ natt_keepalive_remove (struct sockaddr *src, struct sockaddr *dst)
plog (LLV_DEBUG, LOCATION, NULL, "KA removing this one...\n");
TAILQ_REMOVE (&ka_tree, ka, chain);
racoon_free (ka);
natt_keepalive_delete (ka);
/* Should we break here? Every pair of addresses should
be inserted only once, but who knows :-) Lets traverse
the whole list... */