Skip to content

Commit 4df3c79

Browse files
rusty-snaketgross35
authored andcommitted
Add MFD_NOEXEC_SEAL and MFD_EXEC
(apply <#3553> to `main`) [ disable the relevant types on sparc64 - Trevor ] (cherry picked from commit 8b68569)
1 parent 5431bdb commit 4df3c79

File tree

5 files changed

+15
-0
lines changed

5 files changed

+15
-0
lines changed

libc-test/build.rs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3839,6 +3839,10 @@ fn test_linux(target: &str) {
38393839
if name.starts_with("NI_IDN") {
38403840
return true;
38413841
}
3842+
// FIXME: Requires >= 6.3 kernel headers
3843+
if name == "MFD_NOEXEC_SEAL" || name == "MFD_EXEC" {
3844+
return true;
3845+
}
38423846
}
38433847
match name {
38443848
// These constants are not available if gnu headers have been included
@@ -4049,6 +4053,9 @@ fn test_linux(target: &str) {
40494053
if musl => true,
40504054
"CLONE_CLEAR_SIGHAND" | "CLONE_INTO_CGROUP" => true,
40514055

4056+
// FIXME: Requires >= 6.3 kernel headers
4057+
"MFD_EXEC" | "MFD_NOEXEC_SEAL" if sparc64 => true,
4058+
40524059
// kernel 6.1 minimum
40534060
"MADV_COLLAPSE" => true,
40544061

libc-test/semver/android.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1252,7 +1252,9 @@ MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED_SYNC_CORE
12521252
MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED_RSEQ
12531253
MFD_ALLOW_SEALING
12541254
MFD_CLOEXEC
1255+
MFD_EXEC
12551256
MFD_HUGETLB
1257+
MFD_NOEXEC_SEAL
12561258
MINIX2_SUPER_MAGIC
12571259
MINIX2_SUPER_MAGIC2
12581260
MINIX_SUPER_MAGIC

libc-test/semver/linux.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1465,7 +1465,9 @@ MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED_SYNC_CORE
14651465
MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED_RSEQ
14661466
MFD_ALLOW_SEALING
14671467
MFD_CLOEXEC
1468+
MFD_EXEC
14681469
MFD_HUGETLB
1470+
MFD_NOEXEC_SEAL
14691471
MINSIGSTKSZ
14701472
MMAP_PAGE_ZERO
14711473
MNT_DETACH

src/unix/linux_like/android/mod.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2271,6 +2271,8 @@ pub const O_TMPFILE: ::c_int = 0o20000000 | O_DIRECTORY;
22712271
pub const MFD_CLOEXEC: ::c_uint = 0x0001;
22722272
pub const MFD_ALLOW_SEALING: ::c_uint = 0x0002;
22732273
pub const MFD_HUGETLB: ::c_uint = 0x0004;
2274+
pub const MFD_NOEXEC_SEAL: ::c_uint = 0x0008;
2275+
pub const MFD_EXEC: ::c_uint = 0x0010;
22742276
pub const MFD_HUGE_64KB: ::c_uint = 0x40000000;
22752277
pub const MFD_HUGE_512KB: ::c_uint = 0x4c000000;
22762278
pub const MFD_HUGE_1MB: ::c_uint = 0x50000000;

src/unix/linux_like/linux/mod.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2790,6 +2790,8 @@ pub const CMSPAR: ::tcflag_t = 0o10000000000;
27902790
pub const MFD_CLOEXEC: ::c_uint = 0x0001;
27912791
pub const MFD_ALLOW_SEALING: ::c_uint = 0x0002;
27922792
pub const MFD_HUGETLB: ::c_uint = 0x0004;
2793+
pub const MFD_NOEXEC_SEAL: ::c_uint = 0x0008;
2794+
pub const MFD_EXEC: ::c_uint = 0x0010;
27932795
pub const MFD_HUGE_64KB: ::c_uint = 0x40000000;
27942796
pub const MFD_HUGE_512KB: ::c_uint = 0x4c000000;
27952797
pub const MFD_HUGE_1MB: ::c_uint = 0x50000000;

0 commit comments

Comments
 (0)