Module Name: src
Committed By: martin
Date: Fri Sep 6 19:43:00 UTC 2019
Modified Files:
src/sys/netinet6 [netbsd-9]: in6.h
Log Message:
Pull up following revision(s) (requested by kamil in ticket #183):
sys/netinet6/in6.h: revision 1.96
Revert regression introduced in in6.h r. 1.95
----------------------------
revision 1.95
date: 2019-05-28 05:56:46 +0200; author: kamil; state: Exp; lines: +2 -2;
commitid: YrUzDYl5zfcjiVoB;
Decorate struct in6_addr with the __packed attribute
This avoids undefined behavior when accessing misaligned pointers.
Detected by kUBSan.
Patch by Akul Pillai.
----------------------------
This change caused regression in at least qemu and addresses potential binary
ABI breakage.
Fixes PR/54523 by <gson>
To generate a diff of this commit:
cvs rdiff -u -r1.95 -r1.95.2.1 src/sys/netinet6/in6.h
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/in6.h
diff -u src/sys/netinet6/in6.h:1.95 src/sys/netinet6/in6.h:1.95.2.1
--- src/sys/netinet6/in6.h:1.95 Tue May 28 03:56:46 2019
+++ src/sys/netinet6/in6.h Fri Sep 6 19:43:00 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: in6.h,v 1.95 2019/05/28 03:56:46 kamil Exp $ */
+/* $NetBSD: in6.h,v 1.95.2.1 2019/09/06 19:43:00 martin Exp $ */
/* $KAME: in6.h,v 1.83 2001/03/29 02:55:07 jinmei Exp $ */
/*
@@ -126,7 +126,7 @@ struct in6_addr {
__uint16_t __u6_addr16[8];
uint32_t __u6_addr32[4];
} __u6_addr; /* 128-bit IP6 address */
-} __packed;
+};
#define s6_addr __u6_addr.__u6_addr8
#ifdef _KERNEL /* XXX nonstandard */
