git: f56d7f838f5b - stable/12 - elfctl: prefix disable flags with "no"

[Ed Maste]

The branch stable/12 has been updated by emaste:

URL: https://cgit.FreeBSD.org/src/commit/?id=f56d7f838f5b3aa0f55b10406eaa7eb760a3ba18

commit f56d7f838f5b3aa0f55b10406eaa7eb760a3ba18
Author:     Ed Maste <emaste at FreeBSD.org>
AuthorDate: 2021-01-13 18:08:31 +0000
Commit:     Ed Maste <emaste at FreeBSD.org>
CommitDate: 2021-01-26 14:48:14 +0000

    elfctl: prefix disable flags with "no"
    
    Some ELF feature flags indicate a request to opt-out of some feature,
    for example NT_FREEBSD_FCTL_ASLR_DISABLE indicates that ASLR should be
    disabled for the tagged binary.  Using "aslr" as the short name for the
    flag is confusing as it seems to indicate a request for ASLR to be
    enabled.  Rename "noaslr", and make a similar change for other opt-out
    flags.
    
    Reviewed by:    bapt, manu, markj
    MFC after:      1 week
    Sponsored by:   The FreeBSD Foundation
    Differential Revision:  https://reviews.freebsd.org/D28139
    
    (cherry picked from commit c763f99d11fdc9641308124c4a030c90b6a7fdbb)
---
 usr.bin/elfctl/elfctl.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/usr.bin/elfctl/elfctl.c b/usr.bin/elfctl/elfctl.c
index 15b35a5fec4b..205be39fadc7 100644
--- a/usr.bin/elfctl/elfctl.c
+++ b/usr.bin/elfctl/elfctl.c
@@ -65,15 +65,16 @@ struct ControlFeatures {
 };
 
 static struct ControlFeatures featurelist[] = {
-	{ "aslr",	NT_FREEBSD_FCTL_ASLR_DISABLE,	"Disable ASLR" },
-	{ "protmax",	NT_FREEBSD_FCTL_PROTMAX_DISABLE,
+	{ "noaslr",	NT_FREEBSD_FCTL_ASLR_DISABLE,	"Disable ASLR" },
+	{ "noprotmax",	NT_FREEBSD_FCTL_PROTMAX_DISABLE,
 	    "Disable implicit PROT_MAX" },
-	{ "stackgap",	NT_FREEBSD_FCTL_STKGAP_DISABLE, "Disable stack gap" },
+	{ "nostackgap",	NT_FREEBSD_FCTL_STKGAP_DISABLE, "Disable stack gap" },
 	{ "wxneeded",	NT_FREEBSD_FCTL_WXNEEDED, "Requires W+X mappings" },
 #ifdef NT_FREEBSD_FCTL_LA48
 	{ "la48",	NT_FREEBSD_FCTL_LA48, "amd64: Limit user VA to 48bit" },
 #endif
-	{ "aslrstkgap", NT_FREEBSD_FCTL_ASG_DISABLE, "Disable ASLR stack gap" },
+	{ "noaslrstkgap", NT_FREEBSD_FCTL_ASG_DISABLE,
+	    "Disable ASLR stack gap" },
 };
 
 static struct option long_opts[] = {