Re: [PATCH RESEND] KEYS: remove CONFIG_KEYS_COMPAT

From: Eric Biggers
Date: Tue Feb 20 2018 - 14:41:53 EST


On Fri, Jan 05, 2018 at 11:19:47AM -0800, Eric Biggers wrote:
> From: Eric Biggers <ebiggers@xxxxxxxxxx>
>
> KEYS_COMPAT now always takes the value of COMPAT && KEYS. But the
> security/keys/ directory is only compiled if KEYS is enabled, so in
> practice KEYS_COMPAT is the same as COMPAT. Therefore, remove the
> unnecessary KEYS_COMPAT and just use COMPAT directly.
>
> (Also remove an outdated comment from compat.c.)
>
> Signed-off-by: Eric Biggers <ebiggers@xxxxxxxxxx>
> ---
> security/keys/Kconfig | 4 ----
> security/keys/Makefile | 2 +-
> security/keys/compat.c | 5 -----
> security/keys/internal.h | 4 ++--
> 4 files changed, 3 insertions(+), 12 deletions(-)
>
> diff --git a/security/keys/Kconfig b/security/keys/Kconfig
> index 6462e6654ccf..e115d691d977 100644
> --- a/security/keys/Kconfig
> +++ b/security/keys/Kconfig
> @@ -20,10 +20,6 @@ config KEYS
>
> If you are unsure as to whether this is required, answer N.
>
> -config KEYS_COMPAT
> - def_bool y
> - depends on COMPAT && KEYS
> -
> config PERSISTENT_KEYRINGS
> bool "Enable register of persistent per-UID keyrings"
> depends on KEYS
> diff --git a/security/keys/Makefile b/security/keys/Makefile
> index ef1581b337a3..b92ef62b99a1 100644
> --- a/security/keys/Makefile
> +++ b/security/keys/Makefile
> @@ -17,7 +17,7 @@ obj-y := \
> request_key_auth.o \
> user_defined.o
> compat-obj-$(CONFIG_KEY_DH_OPERATIONS) += compat_dh.o
> -obj-$(CONFIG_KEYS_COMPAT) += compat.o $(compat-obj-y)
> +obj-$(CONFIG_COMPAT) += compat.o $(compat-obj-y)
> obj-$(CONFIG_PROC_FS) += proc.o
> obj-$(CONFIG_SYSCTL) += sysctl.o
> obj-$(CONFIG_PERSISTENT_KEYRINGS) += persistent.o
> diff --git a/security/keys/compat.c b/security/keys/compat.c
> index e87c89c0177c..d7445946b701 100644
> --- a/security/keys/compat.c
> +++ b/security/keys/compat.c
> @@ -50,11 +50,6 @@ static long compat_keyctl_instantiate_key_iov(
>
> /*
> * The key control system call, 32-bit compatibility version for 64-bit archs
> - *
> - * This should only be called if the 64-bit arch uses weird pointers in 32-bit
> - * mode or doesn't guarantee that the top 32-bits of the argument registers on
> - * taking a 32-bit syscall are zero. If you can, you should call sys_keyctl()
> - * directly.
> */
> COMPAT_SYSCALL_DEFINE5(keyctl, u32, option,
> u32, arg2, u32, arg3, u32, arg4, u32, arg5)
> diff --git a/security/keys/internal.h b/security/keys/internal.h
> index 9f8208dc0e55..6d54fa8baa64 100644
> --- a/security/keys/internal.h
> +++ b/security/keys/internal.h
> @@ -272,7 +272,7 @@ extern long keyctl_dh_compute(struct keyctl_dh_params __user *, char __user *,
> size_t, struct keyctl_kdf_params __user *);
> extern long __keyctl_dh_compute(struct keyctl_dh_params __user *, char __user *,
> size_t, struct keyctl_kdf_params *);
> -#ifdef CONFIG_KEYS_COMPAT
> +#ifdef CONFIG_COMPAT
> extern long compat_keyctl_dh_compute(struct keyctl_dh_params __user *params,
> char __user *buffer, size_t buflen,
> struct compat_keyctl_kdf_params __user *kdf);
> @@ -287,7 +287,7 @@ static inline long keyctl_dh_compute(struct keyctl_dh_params __user *params,
> return -EOPNOTSUPP;
> }
>
> -#ifdef CONFIG_KEYS_COMPAT
> +#ifdef CONFIG_COMPAT
> static inline long compat_keyctl_dh_compute(
> struct keyctl_dh_params __user *params,
> char __user *buffer, size_t buflen,
> --
> 2.16.0.rc0.223.g4a4ac83678-goog
>

Ping.