diff options
| author | Angelos D. Keromytis <angelos@cvs.openbsd.org> | 2002-06-18 19:21:49 +0000 |
|---|---|---|
| committer | Angelos D. Keromytis <angelos@cvs.openbsd.org> | 2002-06-18 19:21:49 +0000 |
| commit | 7a21491a727b2e6691f33135f3b21c5466d51b29 (patch) | |
| tree | 2f4d7207c17d4705546fc50af6fef593c1b0c3f0 /sys/netinet | |
| parent | 57a10bbb84a5b221d4879b13f6d7c47f129e32cd (diff) | |
Fix reference to free'ed location (unreachable condition because of
spl protection, but better safe...) --- pointed out by sam@errno.com
Diffstat (limited to 'sys/netinet')
| -rw-r--r-- | sys/netinet/ip_ah.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/sys/netinet/ip_ah.c b/sys/netinet/ip_ah.c index fceb0a98a7e..dd35b0c38b9 100644 --- a/sys/netinet/ip_ah.c +++ b/sys/netinet/ip_ah.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_ah.c,v 1.65 2002/06/09 00:58:32 angelos Exp $ */ +/* $OpenBSD: ip_ah.c,v 1.66 2002/06/18 19:21:48 angelos Exp $ */ /* * The authors of this code are John Ioannidis (ji@tla.org), * Angelos D. Keromytis (kermit@csd.uch.gr) and @@ -720,16 +720,16 @@ ah_input_cb(void *op) /* Check for crypto errors. */ if (crp->crp_etype) { + FREE(tc, M_XDATA); + if (tdb->tdb_cryptoid != 0) tdb->tdb_cryptoid = crp->crp_sid; if (crp->crp_etype == EAGAIN) { splx(s); - FREE(tc, M_XDATA); return crypto_dispatch(crp); } - FREE(tc, M_XDATA); ahstat.ahs_noxform++; DPRINTF(("ah_input_cb(): crypto error %d\n", crp->crp_etype)); error = crp->crp_etype; @@ -1232,9 +1232,8 @@ ah_output_cb(void *op) s = spltdb(); tdb = gettdb(tc->tc_spi, &tc->tc_dst, tc->tc_proto); - - FREE(tc, M_XDATA); if (tdb == NULL) { + FREE(tc, M_XDATA); ahstat.ahs_notdb++; DPRINTF(("ah_output_cb(): TDB is expired while in crypto\n")); goto baddone; @@ -1242,6 +1241,8 @@ ah_output_cb(void *op) /* Check for crypto errors. */ if (crp->crp_etype) { + FREE(tc, M_XDATA); + if (tdb->tdb_cryptoid != 0) tdb->tdb_cryptoid = crp->crp_sid; @@ -1258,6 +1259,7 @@ ah_output_cb(void *op) /* Shouldn't happen... */ if (m == NULL) { + FREE(tc, M_XDATA); ahstat.ahs_crypto++; DPRINTF(("ah_output_cb(): bogus returned buffer from " "crypto\n")); @@ -1272,6 +1274,8 @@ ah_output_cb(void *op) if ((tdb->tdb_flags & TDBF_SKIPCRYPTO) == 0) m_copyback(m, 0, skip, ptr); + FREE(tc, M_XDATA); + /* No longer needed. */ crypto_freereq(crp); |