This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[PATCH] tst-pkey: fix detection of CPU support
- From: Aurelien Jarno <aurelien at aurel32 dot net>
- To: libc-alpha at sourceware dot org
- Cc: Aurelien Jarno <aurelien at aurel32 dot net>
- Date: Wed, 3 Jan 2018 17:03:20 +0100
- Subject: [PATCH] tst-pkey: fix detection of CPU support
- Authentication-results: sourceware.org; auth=none
The current tst-pkey.c checks for CPU support using the pkey_alloc
function/syscall and test for EINVAL. In practice ENOSPC can also be
returned. Looking at the kernel code it seems to happen for
architectures which have activated the syscall, but do not have kernel
support yet. This is consistent with the Linux Programmer's Manual,
which says that ENOSPC can be returned "if the processor or operating
system does not support protection keys".
This patch simply tests for EINVAL in addition to ENOSPC. This fixes
misc/tst-pkey on mipsel-linux-gnu.
Changelog:
* sysdeps/unix/sysv/linux/tst-pkey.c (do_test): Test for CPU support
using ENOSPC in addition to EINVAL.
---
ChangeLog | 5 +++++
sysdeps/unix/sysv/linux/tst-pkey.c | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index 68b8c93ccc..c5f6f273b0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2018-01-03 Aurelien Jarno <aurelien@aurel32.net>
+
+ * sysdeps/unix/sysv/linux/tst-pkey.c (do_test): Test for CPU support
+ using ENOSPC in addition to EINVAL.
+
2018-01-02 Wilco Dijkstra <wdijkstr@arm.com>
* math/math.h (math_errhandling): Set to 0 with __FAST_MATH__.
diff --git a/sysdeps/unix/sysv/linux/tst-pkey.c b/sysdeps/unix/sysv/linux/tst-pkey.c
index 5f721d4444..4204e1c3a3 100644
--- a/sysdeps/unix/sysv/linux/tst-pkey.c
+++ b/sysdeps/unix/sysv/linux/tst-pkey.c
@@ -194,7 +194,7 @@ do_test (void)
if (errno == ENOSYS)
FAIL_UNSUPPORTED
("kernel does not support memory protection keys");
- if (errno == EINVAL)
+ if (errno == EINVAL || errno == ENOSPC)
FAIL_UNSUPPORTED
("CPU does not support memory protection keys: %m");
FAIL_EXIT1 ("pkey_alloc: %m");
--
2.15.1