Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/netipsec Revert a part of rev1.49 (six months ago). The ...



details:   https://anonhg.NetBSD.org/src/rev/5d3e4d002eee
branches:  trunk
changeset: 829274:5d3e4d002eee
user:      maxv <maxv%NetBSD.org@localhost>
date:      Wed Jan 24 13:13:11 2018 +0000

description:
Revert a part of rev1.49 (six months ago). The pointer given to memcpy
was correct.

Discussed with Christos and Ryota.

diffstat:

 sys/netipsec/xform_ah.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r b339e3393f5d -r 5d3e4d002eee sys/netipsec/xform_ah.c
--- a/sys/netipsec/xform_ah.c   Wed Jan 24 12:05:50 2018 +0000
+++ b/sys/netipsec/xform_ah.c   Wed Jan 24 13:13:11 2018 +0000
@@ -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 @@
 
                                /* Zeroize all other options. */
                                count = ptr[off + 1];
-                               memcpy(ptr, ipseczeroes, count);
+                               memcpy(ptr + off, ipseczeroes, count);
                                off += count;
                                break;
                        }



Home | Main Index | Thread Index | Old Index