 @@ -1,14 +1,14 @@
-/*	$NetBSD: xform_esp.c,v 1.94 2018/05/30 17:17:11 maxv Exp $	*/
+/*	$NetBSD: xform_esp.c,v 1.95 2018/05/31 05:52:09 maxv Exp $	*/
 /*	$FreeBSD: xform_esp.c,v 1.2.2.1 2003/01/24 05:11:36 sam Exp $	*/
 /*	$OpenBSD: ip_esp.c,v 1.69 2001/06/26 06:18:59 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_esp.c,v 1.94 2018/05/30 17:17:11 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xform_esp.c,v 1.95 2018/05/31 05:52:09 maxv 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>
 @@ -233,27 +233,27 @@ esp_init(struct secasvar *sav, const str
 			break;
 		case 28:
 			sav->alg_auth = SADB_X_AALG_AES192GMAC;
 			sav->tdb_authalgxform = &auth_hash_gmac_aes_192;
 			break;
 		case 36:
 			sav->alg_auth = SADB_X_AALG_AES256GMAC;
 			sav->tdb_authalgxform = &auth_hash_gmac_aes_256;
 			break;
 		default:
 			DPRINTF(("%s: invalid key length %u, must be either of "
 				"20, 28 or 36\n", __func__, keylen));
 			return EINVAL;
+		}
 		memset(&cria, 0, sizeof(cria));
 		cria.cri_alg = sav->tdb_authalgxform->type;
 		cria.cri_klen = _KEYBITS(sav->key_enc);
 		cria.cri_key = _KEYBUF(sav->key_enc);
 		break;
 	default:
 		break;
+	}
 	/* Initialize crypto session. */
 	memset(&crie, 0, sizeof(crie));
 	crie.cri_alg = sav->tdb_encalgxform->type;
 @@ -303,27 +303,27 @@ esp_zeroize(struct secasvar *sav)
 static int
 esp_input(struct mbuf *m, struct secasvar *sav, int skip, int protoff)
+{
 	const struct auth_hash *esph;
 	const struct enc_xform *espx;
 	struct tdb_crypto *tc;
 	int plen, alen, hlen, error, stat = ESP_STAT_CRYPTO;
 	struct newesp *esp;
 	struct cryptodesc *crde;
 	struct cryptop *crp;
 	KASSERT(sav != NULL);
 	KASSERT(sav->tdb_encalgxform != NULL);
-	KASSERTMSG((skip&3) == 0 && (m->m_pkthdr.len&3) == 0,
+	KASSERTMSG((skip & 3) == 0 && (m->m_pkthdr.len & 3) == 0,
 	    "misaligned packet, skip %u pkt len %u",
 	    skip, m->m_pkthdr.len);
 	/* XXX don't pullup, just copy header */
 	M_REGION_GET(esp, struct newesp *, m, skip, sizeof(struct newesp));
 	if (esp == NULL) {
 		/* m already freed */
 		return ENOBUFS;
+	}
 	esph = sav->tdb_authalgxform;
 	espx = sav->tdb_encalgxform;
 	KASSERT(espx != NULL);
 @@ -359,27 +359,27 @@ esp_input(struct mbuf *m, struct secasva
 	/*
 	 * Check sequence number.
 	 */
 	if (esph && sav->replay && !ipsec_chkreplay(ntohl(esp->esp_seq), sav)) {
 		char logbuf[IPSEC_LOGSASTRLEN];
 		DPRINTF(("%s: packet replay check for %s\n", __func__,
 		    ipsec_logsastr(sav, logbuf, sizeof(logbuf))));
 		stat = ESP_STAT_REPLAY;
 		error = EACCES;
 		goto out;
+	}
 	/* Update the counters */
-	ESP_STATADD(ESP_STAT_IBYTES, m->m_pkthdr.len - skip - hlen - alen);
+	ESP_STATADD(ESP_STAT_IBYTES, plen);
 	/* Get crypto descriptors */
 	crp = crypto_getreq(esph ? 2 : 1);
 	if (crp == NULL) {
 		DPRINTF(("%s: failed to acquire crypto descriptors\n",
 		    __func__));
 		error = ENOBUFS;
 		goto out;
+	}
 	/* Get IPsec-specific opaque pointer */
 	size_t extra __diagused = esph == NULL ? 0 : alen;
 	KASSERTMSG(sizeof(*tc) + extra <= esp_pool_item_size,
 @@ -479,35 +479,35 @@ esp_input(struct mbuf *m, struct secasva
 	return crypto_dispatch(crp);
 out2:
 	pool_cache_put(esp_tdb_crypto_pool_cache, tc);
 out1:
 	crypto_freereq(crp);
 out:
 	ESP_STATINC(stat);
 	m_freem(m);
 	return error;
+}
 #ifdef INET6
-#define	IPSEC_COMMON_INPUT_CB(m, sav, skip, protoff) do {		     \
+#define	IPSEC_COMMON_INPUT_CB(m, sav, skip, protoff) do {		\
-	if (saidx->dst.sa.sa_family == AF_INET6) {			     \
+	if (saidx->dst.sa.sa_family == AF_INET6) {			\
-		error = ipsec6_common_input_cb(m, sav, skip, protoff);	     \
+		error = ipsec6_common_input_cb(m, sav, skip, protoff);	\
-	} else {							     \
+	} else {							\
-		error = ipsec4_common_input_cb(m, sav, skip, protoff);	     \
+		error = ipsec4_common_input_cb(m, sav, skip, protoff);	\
-	}								     \
+	}								\
 } while (0)
 #else
-#define	IPSEC_COMMON_INPUT_CB(m, sav, skip, protoff)			     \
+#define	IPSEC_COMMON_INPUT_CB(m, sav, skip, protoff)			\
 	(error = ipsec4_common_input_cb(m, sav, skip, protoff))
 #endif
 /*
  * ESP input callback from the crypto driver.
  */
 static int
 esp_input_cb(struct cryptop *crp)
+{
 	char buf[IPSEC_ADDRSTRLEN];
 	uint8_t lastthree[3], aalg[AH_ALEN_MAX];
 	int hlen, skip, protoff, error;
 	struct mbuf *m;
 @@ -699,35 +699,33 @@ esp_output(struct mbuf *m, const struct
 	struct tdb_crypto *tc;
 	struct secasindex *saidx;
 	unsigned char *tail;
 	uint8_t prot;
 	int error, maxpacketsize;
 	struct esptail *esptail;
 	struct cryptodesc *crde, *crda;
 	struct cryptop *crp;
 	esph = sav->tdb_authalgxform;
 	espx = sav->tdb_encalgxform;
 	KASSERT(espx != NULL);
 	/* Determine the ESP header length */
 	if (sav->flags & SADB_X_EXT_OLD)
 		hlen = sizeof(struct esp) + sav->ivlen;
 	else
 		hlen = sizeof(struct newesp) + sav->ivlen;
 	/* Authenticator hash size */
-	if (esph)
+	alen = esph ? esph->authsize : 0;
 		alen = esph->authsize;
 	else
 		alen = 0;
 	/*
 	 * NB: The null encoding transform has a blocksize of 4
 	 *     so that headers are properly aligned.
 	 */
 	blks = espx->blocksize;		/* IV blocksize */
 	/* Raw payload length. */
 	rlen = m->m_pkthdr.len - skip;
 	/* Encryption padding. */
 	padlen = ((blks - ((rlen + sizeof(struct esptail)) % blks)) % blks);