Update the list of PKEY_* constants

* xlat/pkey_access.in (PKEY_DISABLE_EXECUTE): New constant introduced
by linux kernel commit v4.16-rc1~93^2~85.
* tests/pkey_alloc.c: Update expected output.
* NEWS: Mention it.

diff --git a/NEWS b/NEWS
index a17d1140b22e8e8533cbe3689c1dadf241473b77..958f88bd96c80a63b7b2da6ea71972fe50f703cd 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -28,8 +28,8 @@ Noteworthy changes in release ?.?? (????-??-??)
   * Added decoding of get_tls syscall on arm.
   * Added -e trace=%pure option for tracing system calls with no arguments that
     never fail.
-  * Updated lists of IPV6_*, MAP_*, MEMBARRIER_CMD_*, MSG_*, NT_*, SHM_*,
-    and TCP_* constants.
+  * Updated lists of IPV6_*, MAP_*, MEMBARRIER_CMD_*, MSG_*, NT_*, PKEY_*,
+    SHM_*, and TCP_* constants.
   * Added manual page for the strace-log-merge command.
   * Updated lists of ioctl commands from Linux 4.15.
   * Implemented biarch support for s390x.

diff --git a/tests/pkey_alloc.c b/tests/pkey_alloc.c
index 457727873314126101d4ead5a16d692d93b0c697..12b12e1de4313e05aea9c000aa1f8f6d2f2edb06 100644 (file)
--- a/tests/pkey_alloc.c
+++ b/tests/pkey_alloc.c
@@ -53,10 +53,12 @@ main(void)
                        sizeof(kernel_ulong_t) > sizeof(int) ?
                        "PKEY_DISABLE_WRITE|0xbadc0ded00000000" :
                        "PKEY_DISABLE_WRITE" },
-               { 0xdec0ded, "PKEY_DISABLE_ACCESS|0xdec0dec" },
-               { 0x3, "PKEY_DISABLE_ACCESS|PKEY_DISABLE_WRITE" },
+               { 0xdec0ded, "PKEY_DISABLE_ACCESS|PKEY_DISABLE_EXECUTE|"
+                               "0xdec0de8" },
+               { 0x7, "PKEY_DISABLE_ACCESS|PKEY_DISABLE_WRITE|"
+                               "PKEY_DISABLE_EXECUTE" },
                { ARG_STR(0) },
-               { 0xbadc0dec, "0xbadc0dec /* PKEY_??? */" },
+               { 0xbadc0de8, "0xbadc0de8 /* PKEY_??? */" },
        };
 
        long rc;

diff --git a/xlat/pkey_access.in b/xlat/pkey_access.in
index 37372a8892dae787964dfbe7d0bd0ff3f4e0fce4..108eb3b73dde28822116c8672485f29b993cdcc1 100644 (file)
--- a/xlat/pkey_access.in
+++ b/xlat/pkey_access.in
@@ -1,2 +1,3 @@
 PKEY_DISABLE_ACCESS    0x1
 PKEY_DISABLE_WRITE     0x2
+PKEY_DISABLE_EXECUTE   0x4