Module Name: src
Committed By: maxv
Date: Wed Jan 24 13:13:11 UTC 2018
Modified Files:
src/sys/netipsec: xform_ah.c
Log Message:
Revert a part of rev1.49 (six months ago). The pointer given to memcpy
was correct.
Discussed with Christos and Ryota.
To generate a diff of this commit:
cvs rdiff -u -r1.74 -r1.75 src/sys/netipsec/xform_ah.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/netipsec/xform_ah.c
diff -u src/sys/netipsec/xform_ah.c:1.74 src/sys/netipsec/xform_ah.c:1.75
--- src/sys/netipsec/xform_ah.c:1.74 Tue Oct 3 08:56:52 2017
+++ src/sys/netipsec/xform_ah.c Wed Jan 24 13:13:11 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: xform_ah.c,v 1.74 2017/10/03 08:56:52 ozaki-r Exp $ */
+/* $NetBSD: xform_ah.c,v 1.75 2018/01/24 13:13:11 maxv 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 $ */
/*
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xform_ah.c,v 1.74 2017/10/03 08:56:52 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xform_ah.c,v 1.75 2018/01/24 13:13:11 maxv Exp $");
#if defined(_KERNEL_OPT)
#include "opt_inet.h"
@@ -419,7 +419,7 @@ ah_massage_headers(struct mbuf **m0, int
/* Zeroize all other options. */
count = ptr[off + 1];
- memcpy(ptr, ipseczeroes, count);
+ memcpy(ptr + off, ipseczeroes, count);
off += count;
break;
}
