Auto merge of #2743 - zx2c4-forks:grnd_insecure, r=Amanieu

linux: add GRND_INSECURE constant This is available on kernels ≥5.6.
rust-lang · May 5, 2022 · 32fa13d · 32fa13d
2 parents 42faa24 + 552d131
commit 32fa13d
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 0 deletions.
diff --git a/libc-test/build.rs b/libc-test/build.rs
@@ -1732,6 +1732,9 @@ fn test_android(target: &str) {
             // linux 5.12 min
             "MPOL_F_NUMA_BALANCING" => true,
 
+            // GRND_INSECURE was added in platform-tools-30.0.0
+            "GRND_INSECURE" => true,
+
             _ => false,
         }
     });
@@ -3322,6 +3325,9 @@ fn test_linux(target: &str) {
             // linux 5.17 min
             "PR_SET_VMA" | "PR_SET_VMA_ANON_NAME" => true,
 
+            // GRND_INSECURE was added in glibc-2.32
+            "GRND_INSECURE" => true,
+
             _ => false,
         }
     });

diff --git a/libc-test/semver/android.txt b/libc-test/semver/android.txt
@@ -661,6 +661,7 @@ GENL_NAMSIZ
 GENL_UNS_ADMIN_PERM
 GRND_NONBLOCK
 GRND_RANDOM
+GRND_INSECURE
 GRPQUOTA
 HPFS_SUPER_MAGIC
 HUGETLBFS_MAGIC

diff --git a/libc-test/semver/linux.txt b/libc-test/semver/linux.txt
@@ -649,6 +649,7 @@ GLOB_NOSORT
 GLOB_NOSPACE
 GRND_NONBLOCK
 GRND_RANDOM
+GRND_INSECURE
 IBSHIFT
 IFA_ADDRESS
 IFA_ANYCAST

diff --git a/src/unix/linux_like/android/mod.rs b/src/unix/linux_like/android/mod.rs
@@ -1792,6 +1792,7 @@ pub const NETLINK_GET_STRICT_CHK: ::c_int = 12;
 
 pub const GRND_NONBLOCK: ::c_uint = 0x0001;
 pub const GRND_RANDOM: ::c_uint = 0x0002;
+pub const GRND_INSECURE: ::c_uint = 0x0004;
 
 pub const SECCOMP_MODE_DISABLED: ::c_uint = 0;
 pub const SECCOMP_MODE_STRICT: ::c_uint = 1;

diff --git a/src/unix/linux_like/linux/mod.rs b/src/unix/linux_like/linux/mod.rs
@@ -1784,6 +1784,7 @@ pub const PR_SET_VMA_ANON_NAME: ::c_int = 0;
 
 pub const GRND_NONBLOCK: ::c_uint = 0x0001;
 pub const GRND_RANDOM: ::c_uint = 0x0002;
+pub const GRND_INSECURE: ::c_uint = 0x0004;
 
 pub const SECCOMP_MODE_DISABLED: ::c_uint = 0;
 pub const SECCOMP_MODE_STRICT: ::c_uint = 1;