Module Name: src
Committed By: martin
Date: Tue Jan 30 22:10:56 UTC 2018
Modified Files:
src/sys/netinet6 [netbsd-6-1]: ah_input.c esp_input.c ipcomp_input.c
Log Message:
Ooops, remainder of Ticket #1523, accidently not commited previously
To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.59.14.1 src/sys/netinet6/ah_input.c
cvs rdiff -u -r1.50 -r1.50.14.1 src/sys/netinet6/esp_input.c
cvs rdiff -u -r1.38 -r1.38.14.1 src/sys/netinet6/ipcomp_input.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/netinet6/ah_input.c
diff -u src/sys/netinet6/ah_input.c:1.59 src/sys/netinet6/ah_input.c:1.59.14.1
--- src/sys/netinet6/ah_input.c:1.59 Sun Jul 17 20:54:53 2011
+++ src/sys/netinet6/ah_input.c Tue Jan 30 22:10:56 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ah_input.c,v 1.59 2011/07/17 20:54:53 joerg Exp $ */
+/* $NetBSD: ah_input.c,v 1.59.14.1 2018/01/30 22:10:56 martin Exp $ */
/* $KAME: ah_input.c,v 1.64 2001/09/04 08:43:19 itojun Exp $ */
/*
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ah_input.c,v 1.59 2011/07/17 20:54:53 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ah_input.c,v 1.59.14.1 2018/01/30 22:10:56 martin Exp $");
#include "opt_inet.h"
#include "opt_ipsec.h"
@@ -858,7 +858,8 @@ ah6_input(struct mbuf **mp, int *offp, i
* next header field of the previous header.
* This is necessary because AH will be stripped off below.
*/
- prvnxtp = ip6_get_prevhdr(m, off); /* XXX */
+ const int prvnxt = ip6_get_prevhdr(m, off);
+ prvnxtp = (mtod(m, u_int8_t *) + prvnxt); /* XXX */
*prvnxtp = nxt;
ip6 = mtod(m, struct ip6_hdr *);
Index: src/sys/netinet6/esp_input.c
diff -u src/sys/netinet6/esp_input.c:1.50 src/sys/netinet6/esp_input.c:1.50.14.1
--- src/sys/netinet6/esp_input.c:1.50 Sun Jul 17 20:54:53 2011
+++ src/sys/netinet6/esp_input.c Tue Jan 30 22:10:56 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: esp_input.c,v 1.50 2011/07/17 20:54:53 joerg Exp $ */
+/* $NetBSD: esp_input.c,v 1.50.14.1 2018/01/30 22:10:56 martin Exp $ */
/* $KAME: esp_input.c,v 1.60 2001/09/04 08:43:19 itojun Exp $ */
/*
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: esp_input.c,v 1.50 2011/07/17 20:54:53 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: esp_input.c,v 1.50.14.1 2018/01/30 22:10:56 martin Exp $");
#include "opt_inet.h"
#include "opt_ipsec.h"
@@ -834,7 +834,8 @@ noreplaycheck:
/*
* Set the next header field of the previous header correctly.
*/
- prvnxtp = ip6_get_prevhdr(m, off); /* XXX */
+ const int prvnxt = ip6_get_prevhdr(m, off);
+ prvnxtp = (mtod(m, u_int8_t *) + prvnxt); /* XXX */
*prvnxtp = nxt;
stripsiz = esplen + ivlen;
Index: src/sys/netinet6/ipcomp_input.c
diff -u src/sys/netinet6/ipcomp_input.c:1.38 src/sys/netinet6/ipcomp_input.c:1.38.14.1
--- src/sys/netinet6/ipcomp_input.c:1.38 Sun Jul 17 20:54:53 2011
+++ src/sys/netinet6/ipcomp_input.c Tue Jan 30 22:10:56 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ipcomp_input.c,v 1.38 2011/07/17 20:54:53 joerg Exp $ */
+/* $NetBSD: ipcomp_input.c,v 1.38.14.1 2018/01/30 22:10:56 martin Exp $ */
/* $KAME: ipcomp_input.c,v 1.29 2001/09/04 08:43:19 itojun Exp $ */
/*
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ipcomp_input.c,v 1.38 2011/07/17 20:54:53 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipcomp_input.c,v 1.38.14.1 2018/01/30 22:10:56 martin Exp $");
#include "opt_inet.h"
#include "opt_ipsec.h"
@@ -352,7 +352,8 @@ ipcomp6_input(struct mbuf **mp, int *off
m->m_flags |= M_DECRYPTED;
/* update next header field */
- prvnxtp = ip6_get_prevhdr(m, off);
+ const int prvnxt = ip6_get_prevhdr(m, off);
+ prvnxtp = (mtod(m, u_int8_t *) + prvnxt); /* XXX */
*prvnxtp = nxt;
/*
