Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 13 Nov 2019 22:25:53 +0000 (UTC)
From:      Brooks Davis <brooks@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org
Subject:   svn commit: r354695 - stable/12/sys/sys
Message-ID:  <201911132225.xADMPr0I095388@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: brooks
Date: Wed Nov 13 22:25:53 2019
New Revision: 354695
URL: https://svnweb.freebsd.org/changeset/base/354695

Log:
  MFC r354420:
  
  Fix the alignment of struct xunpcb on systems with >64-bit pointers.
  
  Reviewed by:	emaste
  Obtained from:	CheriBSD
  Sponsored by:	DARPA, AFRL
  Differential Revision:	https://reviews.freebsd.org/D22268

Modified:
  stable/12/sys/sys/unpcb.h
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/sys/unpcb.h
==============================================================================
--- stable/12/sys/sys/unpcb.h	Wed Nov 13 21:51:55 2019	(r354694)
+++ stable/12/sys/sys/unpcb.h	Wed Nov 13 22:25:53 2019	(r354695)
@@ -156,7 +156,7 @@ struct xunpcb {
 		char	xu_dummy2[256];
 	};
 	struct xsocket	xu_socket;
-} __aligned(8);
+} __aligned(MAX(8, sizeof(void *)));
 
 struct xunpgen {
 	ksize_t	xug_len;



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201911132225.xADMPr0I095388>