svn commit: r341686 - in stable/12: contrib/elftoolchain/readelf sys/sys

[Ed Maste]

Author: emaste
Date: Fri Dec  7 13:53:29 2018
New Revision: 341686
URL: https://svnweb.freebsd.org/changeset/base/341686

Log:
  MFC r340076: Define NT_FREEBSD_FEATURE_CTL ELF note type
  
  This ELF note will be used to allow binaries to opt out of, or in to,
  upcoming vulnerability mitigation and other features.

Modified:
  stable/12/contrib/elftoolchain/readelf/readelf.c
  stable/12/sys/sys/elf_common.h
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/contrib/elftoolchain/readelf/readelf.c
==============================================================================
--- stable/12/contrib/elftoolchain/readelf/readelf.c	Fri Dec  7 12:32:25 2018	(r341685)
+++ stable/12/contrib/elftoolchain/readelf/readelf.c	Fri Dec  7 13:53:29 2018	(r341686)
@@ -1121,6 +1121,7 @@ note_type_freebsd(unsigned int nt)
 	case 1: return "NT_FREEBSD_ABI_TAG";
 	case 2: return "NT_FREEBSD_NOINIT_TAG";
 	case 3: return "NT_FREEBSD_ARCH_TAG";
+	case 4: return "NT_FREEBSD_FEATURE_CTL";
 	default: return (note_type_unknown(nt));
 	}
 }

Modified: stable/12/sys/sys/elf_common.h
==============================================================================
--- stable/12/sys/sys/elf_common.h	Fri Dec  7 12:32:25 2018	(r341685)
+++ stable/12/sys/sys/elf_common.h	Fri Dec  7 13:53:29 2018	(r341686)
@@ -759,6 +759,7 @@ typedef struct {
 #define	NT_FREEBSD_ABI_TAG	1
 #define	NT_FREEBSD_NOINIT_TAG	2
 #define	NT_FREEBSD_ARCH_TAG	3
+#define	NT_FREEBSD_FEATURE_CTL	4
 
 /* Values for n_type.  Used in core files. */
 #define	NT_PRSTATUS	1	/* Process status. */