svn commit: r360632 - stable/12/lib/csu/common

[Ed Maste]

Author: emaste
Date: Mon May  4 15:57:13 2020
New Revision: 360632
URL: https://svnweb.freebsd.org/changeset/base/360632

Log:
  MFC r340701: Add NT_FREEBSD_FEATURE_CTL ELF note to csu
  
  This note will be used to allow binaries to opt out of, or in to,
  upcoming vulnerability mitigation and other features.  It is not yet
  connected but being added now to facilitate testing and ensure
  compatibility with existing kernels and tools.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/12/lib/csu/common/crtbrand.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/lib/csu/common/crtbrand.c
==============================================================================
--- stable/12/lib/csu/common/crtbrand.c	Mon May  4 15:07:57 2020	(r360631)
+++ stable/12/lib/csu/common/crtbrand.c	Mon May  4 15:57:13 2020	(r360632)
@@ -67,3 +67,18 @@ static const struct {
 	.name = NOTE_FREEBSD_VENDOR,
 	.desc = __FreeBSD_version
 };
+
+static const struct {
+	int32_t	namesz;
+	int32_t	descsz;
+	int32_t	type;
+	char	name[sizeof(NOTE_FREEBSD_VENDOR)];
+	uint32_t	desc[1];
+} crt_feature_ctl __attribute__ ((section (NOTE_SECTION),
+    aligned(4))) __used = {
+	.namesz = sizeof(NOTE_FREEBSD_VENDOR),
+	.descsz = sizeof(uint32_t),
+	.type = NT_FREEBSD_FEATURE_CTL,
+	.name = NOTE_FREEBSD_VENDOR,
+	.desc = { 0 }
+};