Skip to content

Commit 8b6bfd7

Browse files
committed
Auto merge of #2992 - devnexen:fbsd_procctl_upd, r=JohnTitor
freebsd procctl flags update
2 parents 3daacc5 + f2a18e5 commit 8b6bfd7

File tree

3 files changed

+30
-1
lines changed

3 files changed

+30
-1
lines changed

libc-test/build.rs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2102,6 +2102,15 @@ fn test_freebsd(target: &str) {
21022102
| "PROC_PROTMAX_FORCE_DISABLE"
21032103
| "PROC_PROTMAX_NOFORCE"
21042104
| "PROC_PROTMAX_ACTIVE"
2105+
| "PROC_NO_NEW_PRIVS_CTL"
2106+
| "PROC_NO_NEW_PRIVS_STATUS"
2107+
| "PROC_NO_NEW_PRIVS_ENABLE"
2108+
| "PROC_NO_NEW_PRIVS_DISABLE"
2109+
| "PROC_WXMAP_CTL"
2110+
| "PROC_WXMAP_STATUS"
2111+
| "PROC_WX_MAPPINGS_PERMIT"
2112+
| "PROC_WX_MAPPINGS_DISALLOW_EXEC"
2113+
| "PROC_WXORX_ENFORCE"
21052114
if Some(13) > freebsd_ver =>
21062115
{
21072116
true

libc-test/semver/freebsd.txt

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -911,6 +911,10 @@ POSIX_SPAWN_SETSCHEDULER
911911
POSIX_SPAWN_SETSIGDEF
912912
POSIX_SPAWN_SETSIGMASK
913913
PPPDISC
914+
PROC_NO_NEW_PRIVS_CTL
915+
PROC_NO_NEW_PRIVS_DISABLE
916+
PROC_NO_NEW_PRIVS_ENABLE
917+
PROC_NO_NEW_PRIVS_STATUS
914918
PROC_PDEATHSIG_CTL
915919
PROC_PDEATHSIG_STATUS
916920
PROC_REAP_ACQUIRE
@@ -924,6 +928,11 @@ PROC_TRACE_CTL
924928
PROC_TRACE_STATUS
925929
PROC_TRAPCAP_CTL
926930
PROC_TRAPCAP_STATUS
931+
PROC_WX_MAPPINGS_DISALLOW_EXEC
932+
PROC_WX_MAPPINGS_PERMIT
933+
PROC_WXMAP_CTL
934+
PROC_WXMAP_STATUS
935+
PROC_WXORX_ENFORCE
927936
PTHREAD_CREATE_DETACHED
928937
PTHREAD_CREATE_JOINABLE
929938
PTHREAD_MUTEX_ADAPTIVE_NP
@@ -1927,4 +1936,4 @@ xallocx
19271936
xucred
19281937
eaccess
19291938
dirname
1930-
basename
1939+
basename

src/unix/bsd/freebsdlike/freebsd/mod.rs

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2379,6 +2379,10 @@ pub const PROC_PROTMAX_CTL: ::c_int = 15;
23792379
pub const PROC_PROTMAX_STATUS: ::c_int = 16;
23802380
pub const PROC_STACKGAP_CTL: ::c_int = 17;
23812381
pub const PROC_STACKGAP_STATUS: ::c_int = 18;
2382+
pub const PROC_NO_NEW_PRIVS_CTL: ::c_int = 19;
2383+
pub const PROC_NO_NEW_PRIVS_STATUS: ::c_int = 20;
2384+
pub const PROC_WXMAP_CTL: ::c_int = 21;
2385+
pub const PROC_WXMAP_STATUS: ::c_int = 22;
23822386
pub const PROC_PROCCTL_MD_MIN: ::c_int = 0x10000000;
23832387

23842388
pub const PPROT_SET: ::c_int = 1;
@@ -2408,6 +2412,13 @@ pub const PROC_STACKGAP_DISABLE: ::c_int = 0x0002;
24082412
pub const PROC_STACKGAP_ENABLE_EXEC: ::c_int = 0x0004;
24092413
pub const PROC_STACKGAP_DISABLE_EXEC: ::c_int = 0x0008;
24102414

2415+
pub const PROC_NO_NEW_PRIVS_ENABLE: ::c_int = 1;
2416+
pub const PROC_NO_NEW_PRIVS_DISABLE: ::c_int = 2;
2417+
2418+
pub const PROC_WX_MAPPINGS_PERMIT: ::c_int = 0x0001;
2419+
pub const PROC_WX_MAPPINGS_DISALLOW_EXEC: ::c_int = 0x0002;
2420+
pub const PROC_WXORX_ENFORCE: ::c_int = 0x80000000;
2421+
24112422
pub const AF_SLOW: ::c_int = 33;
24122423
pub const AF_SCLUSTER: ::c_int = 34;
24132424
pub const AF_ARP: ::c_int = 35;

0 commit comments

Comments
 (0)