With the introduction of Morello support in the kernel we enabled compat64 mode to execute normal arm64 binaries.
Make keyctl compatibility version interface generic to be used by both compat32 and compat64 modes.
Note: This fixes a silent error that prevents running docker correctly in compat64 mode.
Signed-off-by: Vincenzo Frascino vincenzo.frascino@arm.com --- security/keys/compat.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/security/keys/compat.c b/security/keys/compat.c index 1545efdca562..028972ee49fd 100644 --- a/security/keys/compat.c +++ b/security/keys/compat.c @@ -1,6 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-or-later -/* 32-bit compatibility syscall for 64-bit systems - * +/* * Copyright (C) 2004-5 Red Hat, Inc. All Rights Reserved. * Written by David Howells (dhowells@redhat.com) */ @@ -12,10 +11,11 @@ #include "internal.h"
/* - * The key control system call, 32-bit compatibility version for 64-bit archs + * The key control system call, compatibility version */ COMPAT_SYSCALL_DEFINE5(keyctl, u32, option, - u32, arg2, u32, arg3, u32, arg4, u32, arg5) + compat_ulong_t, arg2, compat_ulong_t, arg3, + compat_ulong_t, arg4, compat_ulong_t, arg5) { switch (option) { case KEYCTL_GET_KEYRING_ID: