diff options
Diffstat (limited to 'sys/netinet/ip_esp.c')
| -rw-r--r-- | sys/netinet/ip_esp.c | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/sys/netinet/ip_esp.c b/sys/netinet/ip_esp.c index a74bfd341ac..40c3a0147b1 100644 --- a/sys/netinet/ip_esp.c +++ b/sys/netinet/ip_esp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_esp.c,v 1.162 2021/02/25 02:48:21 dlg Exp $ */ +/* $OpenBSD: ip_esp.c,v 1.163 2021/06/18 15:34:21 bluhm Exp $ */ /* * The authors of this code are John Ioannidis (ji@tla.org), * Angelos D. Keromytis (kermit@csd.uch.gr) and @@ -93,6 +93,7 @@ esp_init(struct tdb *tdbp, struct xformsw *xsp, struct ipsecinit *ii) struct enc_xform *txform = NULL; struct auth_hash *thash = NULL; struct cryptoini cria, crie, crin; + int error; if (!ii->ii_encalg && !ii->ii_authalg) { DPRINTF(("esp_init(): neither authentication nor encryption " @@ -294,8 +295,11 @@ esp_init(struct tdb *tdbp, struct xformsw *xsp, struct ipsecinit *ii) cria.cri_key = ii->ii_authkey; } - return crypto_newsession(&tdbp->tdb_cryptoid, + KERNEL_LOCK(); + error = crypto_newsession(&tdbp->tdb_cryptoid, (tdbp->tdb_encalgxform ? &crie : &cria), 0); + KERNEL_UNLOCK(); + return error; } /* @@ -304,7 +308,7 @@ esp_init(struct tdb *tdbp, struct xformsw *xsp, struct ipsecinit *ii) int esp_zeroize(struct tdb *tdbp) { - int err; + int error; if (tdbp->tdb_amxkey) { explicit_bzero(tdbp->tdb_amxkey, tdbp->tdb_amxkeylen); @@ -318,9 +322,11 @@ esp_zeroize(struct tdb *tdbp) tdbp->tdb_emxkey = NULL; } - err = crypto_freesession(tdbp->tdb_cryptoid); + KERNEL_LOCK(); + error = crypto_freesession(tdbp->tdb_cryptoid); + KERNEL_UNLOCK(); tdbp->tdb_cryptoid = 0; - return err; + return error; } #define MAXBUFSIZ (AH_ALEN_MAX > ESP_MAX_IVS ? AH_ALEN_MAX : ESP_MAX_IVS) @@ -519,7 +525,10 @@ esp_input(struct mbuf *m, struct tdb *tdb, int skip, int protoff) crde->crd_len = m->m_pkthdr.len - (skip + hlen + alen); } - return crypto_dispatch(crp); + KERNEL_LOCK(); + error = crypto_dispatch(crp); + KERNEL_UNLOCK(); + return error; drop: m_freem(m); @@ -1006,7 +1015,10 @@ esp_output(struct mbuf *m, struct tdb *tdb, struct mbuf **mp, int skip, crda->crd_len = m->m_pkthdr.len - (skip + alen); } - return crypto_dispatch(crp); + KERNEL_LOCK(); + error = crypto_dispatch(crp); + KERNEL_UNLOCK(); + return error; drop: m_freem(m); |