From: Stephen Kitt <steve@sk2.org>
To: Alejandro Colomar <alx.manpages@gmail.com>,
Michael Kerrisk <mtk.manpages@gmail.com>
Cc: linux-man@vger.kernel.org, Stephen Kitt <steve@sk2.org>
Subject: [PATCH 7/9] pkeys.7: Update the example to match glibc
Date: Fri, 7 Jan 2022 17:46:19 +0100 [thread overview]
Message-ID: <20220107164621.275794-7-steve@sk2.org> (raw)
In-Reply-To: <20220107164621.275794-1-steve@sk2.org>
glibc 2.27 introduced support for the pkeys functions, but the glibc
versions don't match those declared in the example. Update the example
to match glibc, and avoid declaring the functions if glibc is new
enough.
Signed-off-by: Stephen Kitt <steve@sk2.org>
---
man7/pkeys.7 | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/man7/pkeys.7 b/man7/pkeys.7
index 73ddcdc43..480ff21d4 100644
--- a/man7/pkeys.7
+++ b/man7/pkeys.7
@@ -186,8 +186,10 @@ Segmentation fault (core dumped)
#include <unistd.h>
#include <sys/syscall.h>
#include <stdio.h>
+#include <stdlib.h>
#include <sys/mman.h>
+#if __GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 27)
static inline void
wrpkru(unsigned int pkru)
{
@@ -200,7 +202,7 @@ wrpkru(unsigned int pkru)
}
int
-pkey_set(int pkey, unsigned long rights, unsigned long flags)
+pkey_set(int pkey, unsigned long rights)
{
unsigned int pkru = (rights << (2 * pkey));
return wrpkru(pkru);
@@ -214,9 +216,9 @@ pkey_mprotect(void *ptr, size_t size, unsigned long orig_prot,
}
int
-pkey_alloc(void)
+pkey_alloc(unsigned int flags, unsigned int rights)
{
- return syscall(SYS_pkey_alloc, 0, 0);
+ return syscall(SYS_pkey_alloc, flags, rights);
}
int
@@ -224,6 +226,7 @@ pkey_free(unsigned long pkey)
{
return syscall(SYS_pkey_free, pkey);
}
+#endif
#define errExit(msg) do { perror(msg); exit(EXIT_FAILURE); \e
} while (0)
@@ -252,7 +255,7 @@ main(void)
/*
* Allocate a protection key:
*/
- pkey = pkey_alloc();
+ pkey = pkey_alloc(0, 0);
if (pkey == \-1)
errExit("pkey_alloc");
@@ -260,7 +263,7 @@ main(void)
* Disable access to any memory with "pkey" set,
* even though there is none right now.
*/
- status = pkey_set(pkey, PKEY_DISABLE_ACCESS, 0);
+ status = pkey_set(pkey, PKEY_DISABLE_ACCESS);
if (status)
errExit("pkey_set");
--
2.30.2
next prev parent reply other threads:[~2022-01-07 17:03 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-07 16:46 [PATCH 1/9] Add a target to check example programs Stephen Kitt
2022-01-07 16:46 ` [PATCH 2/9] seccomp.2: Use syscall() in the example code Stephen Kitt
2022-01-08 1:18 ` Alejandro Colomar (man-pages)
2022-01-07 16:46 ` [PATCH 3/9] inet.3: Switch to _DEFAULT_SOURCE in the example Stephen Kitt
2022-01-08 1:26 ` Alejandro Colomar (man-pages)
2022-01-08 9:06 ` Stephen Kitt
2022-01-07 16:46 ` [PATCH 4/9] matherr.3: Exclude the example from analysis Stephen Kitt
2022-01-08 1:31 ` Alejandro Colomar (man-pages)
2022-01-08 9:12 ` Stephen Kitt
2022-01-07 16:46 ` [PATCH 5/9] mq_notify.3: Add signal.h for SIGEV_THREAD Stephen Kitt
2022-01-08 1:38 ` Alejandro Colomar (man-pages)
2022-01-07 16:46 ` [PATCH 6/9] newlocale.3: Use LC_GLOBAL_LOCALE, not ..._HANDLE Stephen Kitt
2022-01-08 1:41 ` Alejandro Colomar (man-pages)
2022-01-08 9:13 ` Jakub Wilk
2022-01-08 17:58 ` Alejandro Colomar (man-pages)
2022-01-07 16:46 ` Stephen Kitt [this message]
2022-01-08 1:59 ` [PATCH 7/9] pkeys.7: Update the example to match glibc Alejandro Colomar (man-pages)
2022-01-08 14:18 ` Stephen Kitt
2022-01-08 19:20 ` Alejandro Colomar (man-pages)
2022-01-07 16:46 ` [PATCH 8/9] strtok.3: Enable example analysis, fix declaration Stephen Kitt
2022-01-08 2:04 ` Alejandro Colomar (man-pages)
2022-01-07 16:46 ` [PATCH 9/9] malloc_info.3: Use intptr_t to store pointers Stephen Kitt
2022-01-08 2:25 ` Alejandro Colomar (man-pages)
2022-01-08 10:30 ` Jakub Wilk
2022-01-08 17:09 ` Stephen Kitt
2022-01-08 19:17 ` Alejandro Colomar (man-pages)
2022-01-08 1:15 ` [PATCH 1/9] Add a target to check example programs Alejandro Colomar (man-pages)
2022-01-08 9:22 ` Stephen Kitt
2022-01-08 19:05 ` Alejandro Colomar (man-pages)
2022-01-08 19:38 ` Alejandro Colomar (man-pages)
2022-01-08 2:02 ` Alejandro Colomar (man-pages)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220107164621.275794-7-steve@sk2.org \
--to=steve@sk2.org \
--cc=alx.manpages@gmail.com \
--cc=linux-man@vger.kernel.org \
--cc=mtk.manpages@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox