From: Carsten Haitzler carsten.haitzler@foss.arm.com
Move unsigned long to user_uintptr_t for userspace ABI for purecap to work.
Signed-off-by: Carsten Haitzler carsten.haitzler@foss.arm.com --- security/keys/keyctl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/security/keys/keyctl.c b/security/keys/keyctl.c index 96a92a645216..7b7e910d71f6 100644 --- a/security/keys/keyctl.c +++ b/security/keys/keyctl.c @@ -1866,8 +1866,8 @@ long keyctl_capabilities(unsigned char __user *_buffer, size_t buflen) /* * The key control system call */ -SYSCALL_DEFINE5(keyctl, int, option, unsigned long, arg2, unsigned long, arg3, - unsigned long, arg4, unsigned long, arg5) +SYSCALL_DEFINE5(keyctl, int, option, user_uintptr_t, arg2, user_uintptr_t, arg3, + user_uintptr_t, arg4, user_uintptr_t, arg5) { switch (option) { case KEYCTL_GET_KEYRING_ID:
On 05/09/2022 16:05, carsten.haitzler@foss.arm.com wrote:
From: Carsten Haitzler carsten.haitzler@foss.arm.com
Move unsigned long to user_uintptr_t for userspace ABI for purecap to work.
Signed-off-by: Carsten Haitzler carsten.haitzler@foss.arm.com
security/keys/keyctl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/security/keys/keyctl.c b/security/keys/keyctl.c index 96a92a645216..7b7e910d71f6 100644 --- a/security/keys/keyctl.c +++ b/security/keys/keyctl.c @@ -1866,8 +1866,8 @@ long keyctl_capabilities(unsigned char __user *_buffer, size_t buflen) /*
- The key control system call
*/ -SYSCALL_DEFINE5(keyctl, int, option, unsigned long, arg2, unsigned long, arg3,
unsigned long, arg4, unsigned long, arg5)
+SYSCALL_DEFINE5(keyctl, int, option, user_uintptr_t, arg2, user_uintptr_t, arg3,
{ switch (option) { case KEYCTL_GET_KEYRING_ID:user_uintptr_t, arg4, user_uintptr_t, arg5)
Looks good apart from the commit title, same comment as in v1. I can amend it myself when merging if you want.
Kevin
On 9/6/22 09:22, Kevin Brodsky wrote:
On 05/09/2022 16:05, carsten.haitzler@foss.arm.com wrote:
From: Carsten Haitzler carsten.haitzler@foss.arm.com
Move unsigned long to user_uintptr_t for userspace ABI for purecap to work.
Signed-off-by: Carsten Haitzler carsten.haitzler@foss.arm.com
security/keys/keyctl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/security/keys/keyctl.c b/security/keys/keyctl.c index 96a92a645216..7b7e910d71f6 100644 --- a/security/keys/keyctl.c +++ b/security/keys/keyctl.c @@ -1866,8 +1866,8 @@ long keyctl_capabilities(unsigned char __user *_buffer, size_t buflen) /* * The key control system call */ -SYSCALL_DEFINE5(keyctl, int, option, unsigned long, arg2, unsigned long, arg3, - unsigned long, arg4, unsigned long, arg5) +SYSCALL_DEFINE5(keyctl, int, option, user_uintptr_t, arg2, user_uintptr_t, arg3, + user_uintptr_t, arg4, user_uintptr_t, arg5) { switch (option) { case KEYCTL_GET_KEYRING_ID:
Looks good apart from the commit title, same comment as in v1. I can amend it myself when merging if you want.
I missed that comment (on title) ... i jumped right down to the next. sorry about that.
linux-morello@op-lists.linaro.org