Module Name: src
Committed By: maxv
Date: Sat Mar 3 09:39:29 UTC 2018
Modified Files:
src/sys/netinet: ip_output.c
src/sys/netipsec: ipsec_output.c
Log Message:
Add KASSERTs, we don't want m_nextpkt in ipsec{4/6}_process_packet.
To generate a diff of this commit:
cvs rdiff -u -r1.297 -r1.298 src/sys/netinet/ip_output.c
cvs rdiff -u -r1.69 -r1.70 src/sys/netipsec/ipsec_output.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netinet/ip_output.c
diff -u src/sys/netinet/ip_output.c:1.297 src/sys/netinet/ip_output.c:1.298
--- src/sys/netinet/ip_output.c:1.297 Tue Feb 27 15:01:30 2018
+++ src/sys/netinet/ip_output.c Sat Mar 3 09:39:29 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_output.c,v 1.297 2018/02/27 15:01:30 maxv Exp $ */
+/* $NetBSD: ip_output.c,v 1.298 2018/03/03 09:39:29 maxv Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -91,7 +91,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_output.c,v 1.297 2018/02/27 15:01:30 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_output.c,v 1.298 2018/03/03 09:39:29 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -760,7 +760,7 @@ sendit:
for (; m; m = m0) {
m0 = m->m_nextpkt;
- m->m_nextpkt = 0;
+ m->m_nextpkt = NULL;
if (error) {
m_freem(m);
continue;
Index: src/sys/netipsec/ipsec_output.c
diff -u src/sys/netipsec/ipsec_output.c:1.69 src/sys/netipsec/ipsec_output.c:1.70
--- src/sys/netipsec/ipsec_output.c:1.69 Mon Feb 26 06:34:39 2018
+++ src/sys/netipsec/ipsec_output.c Sat Mar 3 09:39:29 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ipsec_output.c,v 1.69 2018/02/26 06:34:39 maxv Exp $ */
+/* $NetBSD: ipsec_output.c,v 1.70 2018/03/03 09:39:29 maxv Exp $ */
/*
* Copyright (c) 2002, 2003 Sam Leffler, Errno Consulting
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ipsec_output.c,v 1.69 2018/02/26 06:34:39 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipsec_output.c,v 1.70 2018/03/03 09:39:29 maxv Exp $");
#if defined(_KERNEL_OPT)
#include "opt_inet.h"
@@ -466,6 +466,7 @@ ipsec4_process_packet(struct mbuf *m, co
int setdf;
KASSERT(m != NULL);
+ KASSERT(m->m_nextpkt == NULL);
KASSERT(isr != NULL);
s = splsoftnet(); /* insure SA contents don't change */
@@ -718,6 +719,7 @@ ipsec6_process_packet(struct mbuf *m, co
union sockaddr_union *dst;
KASSERT(m != NULL);
+ KASSERT(m->m_nextpkt == NULL);
KASSERT(isr != NULL);
s = splsoftnet(); /* insure SA contents don't change */
