Author: kib
Date: Tue Sep 10 06:47:40 2019
New Revision: 352118
URL: https://svnweb.freebsd.org/changeset/base/352118
Log:
MFC r351774:
Add stackgap control mode to proccontrol(1).
PR: 239894
Modified:
stable/12/usr.bin/proccontrol/proccontrol.c
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/usr.bin/proccontrol/proccontrol.c
==============================================================================
--- stable/12/usr.bin/proccontrol/proccontrol.c Tue Sep 10 06:45:44 2019
(r352117)
+++ stable/12/usr.bin/proccontrol/proccontrol.c Tue Sep 10 06:47:40 2019
(r352118)
@@ -43,6 +43,7 @@ enum {
MODE_INVALID,
MODE_TRACE,
MODE_TRAPCAP,
+ MODE_STACKGAP,
#ifdef PROC_KPTI_CTL
MODE_KPTI,
#endif
@@ -72,8 +73,8 @@ static void __dead2
usage(void)
{
- fprintf(stderr, "Usage: proccontrol -m (aslr|trace|trapcap"
- KPTI_USAGE") [-q] "
+ fprintf(stderr, "Usage: proccontrol -m (aslr|trace|trapcap|"
+ "stackgap"KPTI_USAGE") [-q] "
"[-s (enable|disable)] [-p pid | command]\n");
exit(1);
}
@@ -98,6 +99,8 @@ main(int argc, char *argv[])
mode = MODE_TRACE;
else if (strcmp(optarg, "trapcap") == 0)
mode = MODE_TRAPCAP;
+ else if (strcmp(optarg, "stackgap") == 0)
+ mode = MODE_STACKGAP;
#ifdef PROC_KPTI_CTL
else if (strcmp(optarg, "kpti") == 0)
mode = MODE_KPTI;
@@ -147,6 +150,9 @@ main(int argc, char *argv[])
case MODE_TRAPCAP:
error = procctl(P_PID, pid, PROC_TRAPCAP_STATUS, &arg);
break;
+ case MODE_STACKGAP:
+ error = procctl(P_PID, pid, PROC_STACKGAP_STATUS, &arg);
+ break;
#ifdef PROC_KPTI_CTL
case MODE_KPTI:
error = procctl(P_PID, pid, PROC_KPTI_STATUS, &arg);
@@ -194,6 +200,26 @@ main(int argc, char *argv[])
break;
}
break;
+ case MODE_STACKGAP:
+ switch (arg & (PROC_STACKGAP_ENABLE |
+ PROC_STACKGAP_DISABLE)) {
+ case PROC_STACKGAP_ENABLE:
+ printf("enabled\n");
+ break;
+ case PROC_STACKGAP_DISABLE:
+ printf("disabled\n");
+ break;
+ }
+ switch (arg & (PROC_STACKGAP_ENABLE_EXEC |
+ PROC_STACKGAP_DISABLE_EXEC)) {
+ case PROC_STACKGAP_ENABLE_EXEC:
+ printf("enabled after exec\n");
+ break;
+ case PROC_STACKGAP_DISABLE_EXEC:
+ printf("disabled after exec\n");
+ break;
+ }
+ break;
#ifdef PROC_KPTI_CTL
case MODE_KPTI:
switch (arg & ~PROC_KPTI_STATUS_ACTIVE) {
@@ -227,6 +253,12 @@ main(int argc, char *argv[])
arg = enable ? PROC_TRAPCAP_CTL_ENABLE :
PROC_TRAPCAP_CTL_DISABLE;
error = procctl(P_PID, pid, PROC_TRAPCAP_CTL, &arg);
+ break;
+ case MODE_STACKGAP:
+ arg = enable ? PROC_STACKGAP_ENABLE_EXEC :
+ (PROC_STACKGAP_DISABLE |
+ PROC_STACKGAP_DISABLE_EXEC);
+ error = procctl(P_PID, pid, PROC_STACKGAP_CTL, &arg);
break;
#ifdef PROC_KPTI_CTL
case MODE_KPTI:
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
