diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2007-10-06 02:18:40 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2007-10-06 02:18:40 +0000 |
| commit | 8ff920388972b1de9474c6e452d5af0e09f86477 (patch) | |
| tree | d093baa8a24a654d8a456f72387740773add92db /sys/netinet | |
| parent | 231e9b6545a8d0924bcf5930a81ec9eec2649b92 (diff) | |
Oops. Forgot to do FREE -> free when I did MALLOC -> malloc.
Diffstat (limited to 'sys/netinet')
| -rw-r--r-- | sys/netinet/ip_esp.c | 20 | ||||
| -rw-r--r-- | sys/netinet/ip_ipcomp.c | 20 |
2 files changed, 20 insertions, 20 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); diff --git a/sys/netinet/ip_ipcomp.c b/sys/netinet/ip_ipcomp.c index 8f23dc0a906..2af0d22e61f 100644 --- a/sys/netinet/ip_ipcomp.c +++ b/sys/netinet/ip_ipcomp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_ipcomp.c,v 1.21 2007/10/03 10:52:11 krw Exp $ */ +/* $OpenBSD: ip_ipcomp.c,v 1.22 2007/10/06 02:18:38 krw Exp $ */ /* * Copyright (c) 2001 Jean-Jacques Bernard-Gundol (jj@wabbitt.org) @@ -228,7 +228,7 @@ ipcomp_input_cb(op) m = (struct mbuf *) crp->crp_buf; if (m == NULL) { /* Shouldn't happen... */ - FREE(tc, M_XDATA); + free(tc, M_XDATA); crypto_freereq(crp); ipcompstat.ipcomps_crypto++; DPRINTF(("ipcomp_input_cb(): bogus returned buffer from crypto\n")); @@ -239,7 +239,7 @@ ipcomp_input_cb(op) tdb = gettdb(tc->tc_spi, &tc->tc_dst, tc->tc_proto); if (tdb == NULL) { - FREE(tc, M_XDATA); + free(tc, M_XDATA); ipcompstat.ipcomps_notdb++; DPRINTF(("ipcomp_input_cb(): TDB expired while in crypto")); error = EPERM; @@ -254,7 +254,7 @@ ipcomp_input_cb(op) /* Hard expiration */ if ((tdb->tdb_flags & TDBF_BYTES) && (tdb->tdb_cur_bytes >= tdb->tdb_exp_bytes)) { - FREE(tc, M_XDATA); + free(tc, M_XDATA); pfkeyv2_expire(tdb, SADB_EXT_LIFETIME_HARD); tdb_delete(tdb); error = ENXIO; @@ -276,14 +276,14 @@ ipcomp_input_cb(op) splx(s); return crypto_dispatch(crp); } - FREE(tc, M_XDATA); + free(tc, M_XDATA); ipcompstat.ipcomps_noxform++; DPRINTF(("ipcomp_input_cb(): crypto error %d\n", crp->crp_etype)); error = crp->crp_etype; goto baddone; } - FREE(tc, M_XDATA); + free(tc, M_XDATA); /* Length of data after processing */ clen = crp->crp_olen; @@ -566,7 +566,7 @@ ipcomp_output_cb(cp) m = (struct mbuf *) crp->crp_buf; if (m == NULL) { /* Shouldn't happen... */ - FREE(tc, M_XDATA); + free(tc, M_XDATA); crypto_freereq(crp); ipcompstat.ipcomps_crypto++; DPRINTF(("ipcomp_output_cb(): bogus returned buffer from " @@ -578,7 +578,7 @@ ipcomp_output_cb(cp) tdb = gettdb(tc->tc_spi, &tc->tc_dst, tc->tc_proto); if (tdb == NULL) { - FREE(tc, M_XDATA); + free(tc, M_XDATA); ipcompstat.ipcomps_notdb++; DPRINTF(("ipcomp_output_cb(): TDB expired while in crypto\n")); error = EPERM; @@ -594,14 +594,14 @@ ipcomp_output_cb(cp) splx(s); return crypto_dispatch(crp); } - FREE(tc, M_XDATA); + free(tc, M_XDATA); ipcompstat.ipcomps_noxform++; DPRINTF(("ipcomp_output_cb(): crypto error %d\n", crp->crp_etype)); error = crp->crp_etype; goto baddone; } - FREE(tc, M_XDATA); + free(tc, M_XDATA); /* Check sizes. */ if (rlen < crp->crp_olen) { |