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 4/5] pkeys.7: Rely on the glibc implementations
Date: Sat, 8 Jan 2022 16:43:03 +0100 [thread overview]
Message-ID: <20220108154304.1030478-4-steve@sk2.org> (raw)
In-Reply-To: <20220108154304.1030478-1-steve@sk2.org>
glibc 2.27 added implementations of pkey_set(), pkey_mprotect(),
pkey_alloc(), and pkey_free(); rely on those instead of defining them
in the example. wrpkru() is only used in pkey_set() and can be removed
too (it's the internal-use-only pkey_write() in glibc).
Signed-off-by: Stephen Kitt <steve@sk2.org>
---
man7/pkeys.7 | 38 --------------------------------------
1 file changed, 38 deletions(-)
diff --git a/man7/pkeys.7 b/man7/pkeys.7
index 7c0d37a37..055e57ce3 100644
--- a/man7/pkeys.7
+++ b/man7/pkeys.7
@@ -184,48 +184,10 @@ Segmentation fault (core dumped)
.EX
#define _GNU_SOURCE
#include <unistd.h>
-#include <sys/syscall.h>
#include <stdio.h>
#include <stdlib.h>
#include <sys/mman.h>
-static inline void
-wrpkru(unsigned int pkru)
-{
- unsigned int eax = pkru;
- unsigned int ecx = 0;
- unsigned int edx = 0;
-
- asm volatile(".byte 0x0f,0x01,0xef\en\et"
- : : "a" (eax), "c" (ecx), "d" (edx));
-}
-
-int
-pkey_set(int pkey, unsigned int rights)
-{
- unsigned int pkru = (rights << (2 * pkey));
- wrpkru(pkru);
- return 0;
-}
-
-int
-pkey_mprotect(void *ptr, size_t size, int orig_prot, int pkey)
-{
- return syscall(SYS_pkey_mprotect, ptr, size, orig_prot, pkey);
-}
-
-int
-pkey_alloc(unsigned int flags, unsigned int rights)
-{
- return syscall(SYS_pkey_alloc, flags, rights);
-}
-
-int
-pkey_free(int pkey)
-{
- return syscall(SYS_pkey_free, pkey);
-}
-
#define errExit(msg) do { perror(msg); exit(EXIT_FAILURE); \e
} while (0)
--
2.30.2
next prev parent reply other threads:[~2022-01-08 15:53 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-08 15:43 [PATCH 1/5] mq_notify.3: Add signal.h for SIGEV_ constants Stephen Kitt
2022-01-08 15:43 ` [PATCH 2/5] newlocale.3: Use LC_GLOBAL_LOCALE, not ..._HANDLE Stephen Kitt
2022-01-08 19:44 ` Alejandro Colomar (man-pages)
2022-01-08 15:43 ` [PATCH 3/5] pkeys.7: Update the example to match glibc Stephen Kitt
2022-01-08 19:49 ` Alejandro Colomar (man-pages)
2022-01-08 15:43 ` Stephen Kitt [this message]
2022-01-08 15:43 ` [PATCH 5/5] strtok.3: Fix j/str1 declaration Stephen Kitt
2022-01-08 19:51 ` Alejandro Colomar (man-pages)
2022-01-08 16:02 ` [PATCH 1/5] mq_notify.3: Add signal.h for SIGEV_ constants Stephen Kitt
2022-01-08 19:42 ` 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=20220108154304.1030478-4-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