2016-10-17 15:18:24

by Dave Hansen

Subject: [PATCH] generic syscalls: kill cruft from removed pkey syscalls

From: Dave Hansen <[email protected]>

pkey_set() and pkey_get() were syscalls present in older versions
of the protection keys patches. They were fully excised from the
x86 code, but some cruft was left in the generic syscall code. The
C++ comments were intended to help to make it more glaring to me to
fix them before actually submitting them. That technique worked,
but later than I would have liked.

I test-compiled this for arm64.

Signed-off-by: Dave Hansen <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Cc: [email protected]
Cc: Arnd Bergmann <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Fixes: a60f7b69d92c0 ("generic syscalls: Wire up memory protection keys syscalls")
---

b/include/linux/syscalls.h | 3 ---
b/include/uapi/asm-generic/unistd.h | 4 ----
2 files changed, 7 deletions(-)

diff -puN include/uapi/asm-generic/unistd.h~kill-kpkey-syscall-nr-cruft include/uapi/asm-generic/unistd.h
--- a/include/uapi/asm-generic/unistd.h~kill-kpkey-syscall-nr-cruft 2016-10-17 08:05:47.587207124 -0700
+++ b/include/uapi/asm-generic/unistd.h 2016-10-17 08:06:01.759844119 -0700
@@ -730,10 +730,6 @@ __SYSCALL(__NR_pkey_mprotect, sys_pkey_m
__SYSCALL(__NR_pkey_alloc, sys_pkey_alloc)
#define __NR_pkey_free 290
__SYSCALL(__NR_pkey_free, sys_pkey_free)
-#define __NR_pkey_get 291
-//__SYSCALL(__NR_pkey_get, sys_pkey_get)
-#define __NR_pkey_set 292
-//__SYSCALL(__NR_pkey_set, sys_pkey_set)

#undef __NR_syscalls
#define __NR_syscalls 291
diff -puN include/linux/syscalls.h~kill-kpkey-syscall-nr-cruft include/linux/syscalls.h
--- a/include/linux/syscalls.h~kill-kpkey-syscall-nr-cruft 2016-10-17 08:06:42.364669174 -0700
+++ b/include/linux/syscalls.h 2016-10-17 08:07:03.688627647 -0700
@@ -902,8 +902,5 @@ asmlinkage long sys_pkey_mprotect(unsign
unsigned long prot, int pkey);
asmlinkage long sys_pkey_alloc(unsigned long flags, unsigned long init_val);
asmlinkage long sys_pkey_free(int pkey);
-//asmlinkage long sys_pkey_get(int pkey, unsigned long flags);
-//asmlinkage long sys_pkey_set(int pkey, unsigned long access_rights,
-// unsigned long flags);

#endif
_

2016-10-17 15:38:06

by Arnd Bergmann

Subject: Re: [PATCH] generic syscalls: kill cruft from removed pkey syscalls

On Monday, October 17, 2016 8:18:15 AM CEST Dave Hansen wrote:
>
> pkey_set() and pkey_get() were syscalls present in older versions
> of the protection keys patches. They were fully excised from the
> x86 code, but some cruft was left in the generic syscall code. The
> C++ comments were intended to help to make it more glaring to me to
> fix them before actually submitting them. That technique worked,
> but later than I would have liked.
>
> I test-compiled this for arm64.
>
> Signed-off-by: Dave Hansen <[email protected]>
> Cc: Thomas Gleixner <[email protected]>
> Cc: [email protected]
> Cc: Arnd Bergmann <[email protected]>
> Cc: [email protected]
> Cc: [email protected]
> Cc: [email protected]
> Cc: [email protected]
> Cc: [email protected]
> Cc: [email protected]
> Cc: [email protected]
> Fixes: a60f7b69d92c0 ("generic syscalls: Wire up memory protection keys syscalls")

Acked-by: Arnd Bergmann <[email protected]>