 @@ -1,14 +1,14 @@
-/*	$NetBSD: xform_ah.c,v 1.66 2017/07/20 03:12:05 ozaki-r Exp $	*/
+/*	$NetBSD: xform_ah.c,v 1.67 2017/07/20 03:17:59 ozaki-r Exp $	*/
 /*	$FreeBSD: src/sys/netipsec/xform_ah.c,v 1.1.4.1 2003/01/24 05:11:36 sam Exp $	*/
 /*	$OpenBSD: ip_ah.c,v 1.63 2001/06/26 06:18:58 angelos Exp $ */
 /*
  * The authors of this code are John Ioannidis (ji@tla.org),
  * Angelos D. Keromytis (kermit@csd.uch.gr) and
  * Niels Provos (provos@physnet.uni-hamburg.de).
+ *
  * The original version of this code was written by John Ioannidis
  * for BSD/OS in Athens, Greece, in November 1995.
+ *
  * Ported to OpenBSD and NetBSD, with additional transforms, in December 1996,
  * by Angelos D. Keromytis.
+ *
 @@ -29,27 +29,27 @@
  * You may use this code under the GNU public license if you so wish. Please
  * contribute changes back to the authors under this freer than GPL license
  * so that we may further the use of strong encryption without limitations to
  * all.
+ *
  * THIS SOFTWARE IS BEING PROVIDED "AS IS", WITHOUT ANY EXPRESS OR
  * IMPLIED WARRANTY. IN PARTICULAR, NONE OF THE AUTHORS MAKES ANY
  * REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE
  * MERCHANTABILITY OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR
  * PURPOSE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xform_ah.c,v 1.66 2017/07/20 03:12:05 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xform_ah.c,v 1.67 2017/07/20 03:17:59 ozaki-r Exp $");
 #if defined(_KERNEL_OPT)
 #include "opt_inet.h"
 #include "opt_ipsec.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/syslog.h>
 #include <sys/kernel.h>
 #include <sys/sysctl.h>
 @@ -608,166 +608,168 @@ ah_massage_headers(struct mbuf **m0, int
+	}
 	return 0;
+}
 /*
  * ah_input() gets called to verify that an input packet
  * passes authentication.
  */
 static int
 ah_input(struct mbuf *m, struct secasvar *sav, int skip, int protoff)
+{
 	const struct auth_hash *ahx;
-	struct tdb_crypto *tc;
+	struct tdb_crypto *tc = NULL;
 	struct newah *ah;
-	int hl, rplen, authsize, error;
+	int hl, rplen, authsize, error, stat = AH_STAT_HDROPS;
 	struct cryptodesc *crda;
-	struct cryptop *crp;
+	struct cryptop *crp = NULL;
 	IPSEC_SPLASSERT_SOFTNET(__func__);
 	KASSERT(sav != NULL);
 	KASSERT(sav->key_auth != NULL);
 	KASSERT(sav->tdb_authalgxform != NULL);
 	/* Figure out header size. */
 	rplen = HDRSIZE(sav);
 	/* XXX don't pullup, just copy header */
 	IP6_EXTHDR_GET(ah, struct newah *, m, skip, rplen);
 	if (ah == NULL) {
 		DPRINTF(("%s: cannot pullup header\n", __func__));
-		AH_STATINC(AH_STAT_HDROPS);	/*XXX*/
+		error = ENOBUFS;
-		m_freem(m);
+		stat = AH_STAT_HDROPS;	/*XXX*/
-		return ENOBUFS;
+		goto bad;
+	}
 	/* Check replay window, if applicable. */
 	if (sav->replay && !ipsec_chkreplay(ntohl(ah->ah_seq), sav)) {
 		char buf[IPSEC_LOGSASTRLEN];
 		AH_STATINC(AH_STAT_REPLAY);
 		DPRINTF(("%s: packet replay failure: %s\n", __func__,
 		    ipsec_logsastr(sav, buf, sizeof(buf))));
-		m_freem(m);
+		stat = AH_STAT_REPLAY;
-		return ENOBUFS;
+		error = ENOBUFS;
 		goto bad;
+	}
 	/* Verify AH header length. */
 	hl = ah->ah_len * sizeof(uint32_t);
 	ahx = sav->tdb_authalgxform;
 	authsize = AUTHSIZE(sav);
 	if (hl != authsize + rplen - sizeof(struct ah)) {
 		char buf[IPSEC_ADDRSTRLEN];
 		DPRINTF(("%s: bad authenticator length %u (expecting %lu)"
 			" for packet in SA %s/%08lx\n", __func__,
 			hl, (u_long) (authsize + rplen - sizeof(struct ah)),
 			ipsec_address(&sav->sah->saidx.dst, buf, sizeof(buf)),
 			(u_long) ntohl(sav->spi)));
-		AH_STATINC(AH_STAT_BADAUTHL);
+		stat = AH_STAT_BADAUTHL;
-		m_freem(m);
+		error = EACCES;
-		return EACCES;
+		goto bad;
+	}
 	AH_STATADD(AH_STAT_IBYTES, m->m_pkthdr.len - skip - hl);
 	/* Get crypto descriptors. */
 	crp = crypto_getreq(1);
 	if (crp == NULL) {
 		DPRINTF(("%s: failed to acquire crypto descriptor\n", __func__));
-		AH_STATINC(AH_STAT_CRYPTO);
+		stat = AH_STAT_CRYPTO;
-		m_freem(m);
+		error = ENOBUFS;
-		return ENOBUFS;
+		goto bad;
+	}
 	crda = crp->crp_desc;
 	KASSERT(crda != NULL);
 	crda->crd_skip = 0;
 	crda->crd_len = m->m_pkthdr.len;
 	crda->crd_inject = skip + rplen;
 	/* Authentication operation. */
 	crda->crd_alg = ahx->type;
 	crda->crd_key = _KEYBUF(sav->key_auth);
 	crda->crd_klen = _KEYBITS(sav->key_auth);
 	/* Allocate IPsec-specific opaque crypto info. */
 	size_t size = sizeof(*tc);
 	size_t extra = skip + rplen + authsize;
 	size += extra;
 	tc = malloc(size, M_XDATA, M_NOWAIT|M_ZERO);
 	if (tc == NULL) {
 		DPRINTF(("%s: failed to allocate tdb_crypto\n", __func__));
-		AH_STATINC(AH_STAT_CRYPTO);
+		stat = AH_STAT_CRYPTO;
-		crypto_freereq(crp);
+		error = ENOBUFS;
-		m_freem(m);
+		goto bad;
 		return ENOBUFS;
+	}
 	error = m_makewritable(&m, 0, extra, M_NOWAIT);
 	if (error) {
 		m_freem(m);
 		DPRINTF(("%s: failed to m_makewritable\n", __func__));
-		AH_STATINC(AH_STAT_HDROPS);
+		goto bad;
 		free(tc, M_XDATA);
 		crypto_freereq(crp);
 		return error;
+	}
 	/*
 	 * Save the authenticator, the skipped portion of the packet,
 	 * and the AH header.
 	 */
 	m_copydata(m, 0, extra, (tc + 1));
 	/* Zeroize the authenticator on the packet. */
 	m_copyback(m, skip + rplen, authsize, ipseczeroes);
 	/* "Massage" the packet headers for crypto processing. */
 	error = ah_massage_headers(&m, sav->sah->saidx.dst.sa.sa_family,
 	    skip, ahx->type, 0);
 	if (error != 0) {
 		/* NB: mbuf is free'd by ah_massage_headers */
-		AH_STATINC(AH_STAT_HDROPS);
+		m = NULL;
-		free(tc, M_XDATA);
+		goto bad;
 		crypto_freereq(crp);
 		return error;
+	}
 	/* Crypto operation descriptor. */
 	crp->crp_ilen = m->m_pkthdr.len; /* Total input length. */
 	crp->crp_flags = CRYPTO_F_IMBUF;
 	crp->crp_buf = m;
 	crp->crp_callback = ah_input_cb;
 	crp->crp_sid = sav->tdb_cryptoid;
 	crp->crp_opaque = tc;
 	/* These are passed as-is to the callback. */
 	tc->tc_spi = sav->spi;
 	tc->tc_dst = sav->sah->saidx.dst;
 	tc->tc_proto = sav->sah->saidx.proto;
 	tc->tc_nxt = ah->ah_nxt;
 	tc->tc_protoff = protoff;
 	tc->tc_skip = skip;
 	tc->tc_sav = sav;
 	KEY_SA_REF(sav);
 	DPRINTF(("%s: hash over %d bytes, skip %d: "
 		 "crda len %d skip %d inject %d\n", __func__,
 		 crp->crp_ilen, tc->tc_skip,
 		 crda->crd_len, crda->crd_skip, crda->crd_inject));
 	return crypto_dispatch(crp);
 bad:
 	if (tc != NULL)
 		free(tc, M_XDATA);
 	if (crp != NULL)
 		crypto_freereq(crp);
 	if (m != NULL)
 		m_freem(m);
 	AH_STATINC(stat);
 	return error;
+}
 #ifdef INET6
 #define	IPSEC_COMMON_INPUT_CB(m, sav, skip, protoff) do {		     \
 	if (saidx->dst.sa.sa_family == AF_INET6) {			     \
 		error = ipsec6_common_input_cb(m, sav, skip, protoff);	     \
 	} else {							     \
 		error = ipsec4_common_input_cb(m, sav, skip, protoff);	     \
 	}								     \
 } while (0)
 #else
 #define	IPSEC_COMMON_INPUT_CB(m, sav, skip, protoff)			     \
 	(error = ipsec4_common_input_cb(m, sav, skip, protoff))