From 31e1025264b455ef5eb88c535834d0326fa6ad85 Mon Sep 17 00:00:00 2001 From: Eugene Syromyatnikov Date: Mon, 12 Feb 2018 19:01:10 +0100 Subject: [PATCH] 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. --- NEWS | 4 ++-- tests/pkey_alloc.c | 8 +++++--- xlat/pkey_access.in | 1 + 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/NEWS b/NEWS index a17d1140..958f88bd 100644 --- 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 45772787..12b12e1d 100644 --- 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 37372a88..108eb3b7 100644 --- 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 -- 2.40.0