From 86f8a99e3f142722bfb7bc67eb81b5b4e3972c47 Mon Sep 17 00:00:00 2001 From: "Dmitry V. Levin" Date: Mon, 20 May 2019 22:50:44 +0000 Subject: [PATCH] xlat: update PR_SPEC_* constants * xlat/pr_spec_get_store_bypass_flags.in (PR_SPEC_DISABLE_NOEXEC): New constant introduced by Linux kernel commit v5.1-rc1~168^2. * xlat/pr_spec_set_store_bypass_flags.in: Likewise. * NEWS: Mention this. * tests/prctl-spec-inject.c (get_strs, set_strs): Update. --- NEWS | 2 +- tests/prctl-spec-inject.c | 6 ++++-- xlat/pr_spec_get_store_bypass_flags.in | 1 + xlat/pr_spec_set_store_bypass_flags.in | 1 + 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/NEWS b/NEWS index 121f98fd..9dd2973a 100644 --- a/NEWS +++ b/NEWS @@ -28,7 +28,7 @@ Noteworthy changes in release ?.? (????-??-??) and xtensa. * Wired up direct ipc syscalls on m68k, mips o32, powerpc, powerpc64, s390, s390x, sh, sparc, sparc64, and x86. - * Updated lists of BPF_*, NT_*, SO_*, and V4L2_* constants. + * Updated lists of BPF_*, NT_*, PR_SPEC_*, SO_*, and V4L2_* constants. Noteworthy changes in release 5.0 (2019-03-19) ============================================== diff --git a/tests/prctl-spec-inject.c b/tests/prctl-spec-inject.c index 04403b43..eb064d0f 100644 --- a/tests/prctl-spec-inject.c +++ b/tests/prctl-spec-inject.c @@ -58,7 +58,8 @@ main(int argc, char **argv) { 1, " (PR_SPEC_PRCTL)" }, { 3, " (PR_SPEC_PRCTL|PR_SPEC_ENABLE)" }, { 8, " (PR_SPEC_FORCE_DISABLE)" }, - { 16, " (0x10)" }, + { 16, " (PR_SPEC_DISABLE_NOEXEC)" }, + { 32, " (0x20)" }, { 42, " (PR_SPEC_ENABLE|PR_SPEC_FORCE_DISABLE|0x20)" }, }; static const struct { @@ -70,7 +71,8 @@ main(int argc, char **argv) { 2, "PR_SPEC_ENABLE" }, { 3, "0x3 /* PR_SPEC_??? */" }, { 8, "PR_SPEC_FORCE_DISABLE" }, - { 16, "0x10 /* PR_SPEC_??? */" }, + { 16, "PR_SPEC_DISABLE_NOEXEC" }, + { 32, "0x20 /* PR_SPEC_??? */" }, { (kernel_ulong_t) 0xdecafeedbeefda7eULL, "0x" # if SIZEOF_KERNEL_LONG_T == 8 "decafeed" diff --git a/xlat/pr_spec_get_store_bypass_flags.in b/xlat/pr_spec_get_store_bypass_flags.in index 81f3674d..64309c38 100644 --- a/xlat/pr_spec_get_store_bypass_flags.in +++ b/xlat/pr_spec_get_store_bypass_flags.in @@ -3,3 +3,4 @@ PR_SPEC_PRCTL (1 << 0) PR_SPEC_ENABLE (1 << 1) PR_SPEC_DISABLE (1 << 2) PR_SPEC_FORCE_DISABLE (1 << 3) +PR_SPEC_DISABLE_NOEXEC (1 << 4) diff --git a/xlat/pr_spec_set_store_bypass_flags.in b/xlat/pr_spec_set_store_bypass_flags.in index 04f3a03d..6f9b6259 100644 --- a/xlat/pr_spec_set_store_bypass_flags.in +++ b/xlat/pr_spec_set_store_bypass_flags.in @@ -1,3 +1,4 @@ PR_SPEC_ENABLE (1 << 1) PR_SPEC_DISABLE (1 << 2) PR_SPEC_FORCE_DISABLE (1 << 3) +PR_SPEC_DISABLE_NOEXEC (1 << 4) -- 2.40.0