summaryrefslogtreecommitdiff
path: root/sys/netinet/ip_esp.c
diff options
context:
space:
mode:
authorKenneth R Westerback <krw@cvs.openbsd.org>2007-10-06 02:18:40 +0000
committerKenneth R Westerback <krw@cvs.openbsd.org>2007-10-06 02:18:40 +0000
commit8ff920388972b1de9474c6e452d5af0e09f86477 (patch)
treed093baa8a24a654d8a456f72387740773add92db /sys/netinet/ip_esp.c
parent231e9b6545a8d0924bcf5930a81ec9eec2649b92 (diff)
Oops. Forgot to do FREE -> free when I did MALLOC -> malloc.
Diffstat (limited to 'sys/netinet/ip_esp.c')
-rw-r--r--sys/netinet/ip_esp.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/sys/netinet/ip_esp.c b/sys/netinet/ip_esp.c
index cfd1148b1d5..d4607b9e65d 100644
--- a/sys/netinet/ip_esp.c
+++ b/sys/netinet/ip_esp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip_esp.c,v 1.101 2007/10/03 10:52:11 krw Exp $ */
+/* $OpenBSD: ip_esp.c,v 1.102 2007/10/06 02:18:38 krw Exp $ */
/*
* The authors of this code are John Ioannidis (ji@tla.org),
* Angelos D. Keromytis (kermit@csd.uch.gr) and
@@ -511,7 +511,7 @@ esp_input_cb(void *op)
m = (struct mbuf *) crp->crp_buf;
if (m == NULL) {
/* Shouldn't happen... */
- FREE(tc, M_XDATA);
+ free(tc, M_XDATA);
crypto_freereq(crp);
espstat.esps_crypto++;
DPRINTF(("esp_input_cb(): bogus returned buffer from crypto\n"));
@@ -522,7 +522,7 @@ esp_input_cb(void *op)
tdb = gettdb(tc->tc_spi, &tc->tc_dst, tc->tc_proto);
if (tdb == NULL) {
- FREE(tc, M_XDATA);
+ free(tc, M_XDATA);
espstat.esps_notdb++;
DPRINTF(("esp_input_cb(): TDB is expired while in crypto"));
error = EPERM;
@@ -540,7 +540,7 @@ esp_input_cb(void *op)
splx(s);
return crypto_dispatch(crp);
}
- FREE(tc, M_XDATA);
+ free(tc, M_XDATA);
espstat.esps_noxform++;
DPRINTF(("esp_input_cb(): crypto error %d\n", crp->crp_etype));
error = crp->crp_etype;
@@ -562,7 +562,7 @@ esp_input_cb(void *op)
/* Verify authenticator */
if (bcmp(ptr, aalg, esph->authsize)) {
- FREE(tc, M_XDATA);
+ free(tc, M_XDATA);
DPRINTF(("esp_input_cb(): authentication failed for packet in SA %s/%08x\n", ipsp_address(tdb->tdb_dst), ntohl(tdb->tdb_spi)));
espstat.esps_badauth++;
error = EACCES;
@@ -573,7 +573,7 @@ esp_input_cb(void *op)
/* Remove trailing authenticator */
m_adj(m, -(esph->authsize));
}
- FREE(tc, M_XDATA);
+ free(tc, M_XDATA);
/* Replay window checking, if appropriate */
if ((tdb->tdb_wnd > 0) && (!(tdb->tdb_flags & TDBF_NOREPLAY))) {
@@ -1014,7 +1014,7 @@ esp_output_cb(void *op)
m = (struct mbuf *) crp->crp_buf;
if (m == NULL) {
/* Shouldn't happen... */
- FREE(tc, M_XDATA);
+ free(tc, M_XDATA);
crypto_freereq(crp);
espstat.esps_crypto++;
DPRINTF(("esp_output_cb(): bogus returned buffer from "
@@ -1027,7 +1027,7 @@ esp_output_cb(void *op)
tdb = gettdb(tc->tc_spi, &tc->tc_dst, tc->tc_proto);
if (tdb == NULL) {
- FREE(tc, M_XDATA);
+ free(tc, M_XDATA);
espstat.esps_notdb++;
DPRINTF(("esp_output_cb(): TDB is expired while in crypto\n"));
error = EPERM;
@@ -1043,14 +1043,14 @@ esp_output_cb(void *op)
splx(s);
return crypto_dispatch(crp);
}
- FREE(tc, M_XDATA);
+ free(tc, M_XDATA);
espstat.esps_noxform++;
DPRINTF(("esp_output_cb(): crypto error %d\n",
crp->crp_etype));
error = crp->crp_etype;
goto baddone;
}
- FREE(tc, M_XDATA);
+ free(tc, M_XDATA);
/* Release crypto descriptors. */
crypto_freereq(crp);