Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 98f76206 authored by Dmitry Safonov's avatar Dmitry Safonov Committed by Thomas Gleixner
Browse files

compat: Cleanup in_compat_syscall() callers 



Now that in_compat_syscall() is consistent on all architectures and does
not longer report true on native i686, the workarounds (ifdeffery and
helpers) can be removed.

Signed-off-by: default avatarDmitry Safonov <dima@arista.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: Dmitry Safonov <0x7f454c46@gmail.com>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Andy Lutomirsky <luto@kernel.org>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: John Stultz <john.stultz@linaro.org>
Cc: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Steffen Klassert <steffen.klassert@secunet.com>
Cc: Stephen Boyd <sboyd@kernel.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: linux-efi@vger.kernel.org
Cc: netdev@vger.kernel.org
Link: https://lkml.kernel.org/r/20181012134253.23266-3-dima@arista.com
parent a846446b

drivers/firmware/efi/efivars.c

+4 −12
Original line number Diff line number Diff line
@@ -229,14 +229,6 @@ sanity_check(struct efi_variable *var, efi_char16_t *name, efi_guid_t vendor, 
	return 0;

}



static inline bool is_compat(void)

{

	if (IS_ENABLED(CONFIG_COMPAT) && in_compat_syscall())

		return true;



	return false;

}



static void

copy_out_compat(struct efi_variable *dst, struct compat_efi_variable *src)

{
@@ -263,7 +255,7 @@ efivar_store_raw(struct efivar_entry *entry, const char *buf, size_t count) 
	u8 *data;

	int err;



	if (is_compat()) {

	if (in_compat_syscall()) {

		struct compat_efi_variable *compat;



		if (count != sizeof(*compat))
@@ -324,7 +316,7 @@ efivar_show_raw(struct efivar_entry *entry, char *buf) 
			     &entry->var.DataSize, entry->var.Data))

		return -EIO;



	if (is_compat()) {

	if (in_compat_syscall()) {

		compat = (struct compat_efi_variable *)buf;



		size = sizeof(*compat);
@@ -418,7 +410,7 @@ static ssize_t efivar_create(struct file *filp, struct kobject *kobj, 
	struct compat_efi_variable *compat = (struct compat_efi_variable *)buf;

	struct efi_variable *new_var = (struct efi_variable *)buf;

	struct efivar_entry *new_entry;

	bool need_compat = is_compat();

	bool need_compat = in_compat_syscall();

	efi_char16_t *name;

	unsigned long size;

	u32 attributes;
@@ -495,7 +487,7 @@ static ssize_t efivar_delete(struct file *filp, struct kobject *kobj, 
	if (!capable(CAP_SYS_ADMIN))

		return -EACCES;



	if (is_compat()) {

	if (in_compat_syscall()) {

		if (count != sizeof(*compat))

			return -EINVAL;

kernel/time/time.c

+1 −1
Original line number Diff line number Diff line
@@ -842,7 +842,7 @@ int get_timespec64(struct timespec64 *ts, 
	ts->tv_sec = kts.tv_sec;



	/* Zero out the padding for 32 bit systems or in compat mode */

	if (IS_ENABLED(CONFIG_64BIT_TIME) && (!IS_ENABLED(CONFIG_64BIT) || in_compat_syscall()))

	if (IS_ENABLED(CONFIG_64BIT_TIME) && in_compat_syscall())

		kts.tv_nsec &= 0xFFFFFFFFUL;



	ts->tv_nsec = kts.tv_nsec;

net/xfrm/xfrm_state.c

+0 −2
Original line number Diff line number Diff line
@@ -2077,10 +2077,8 @@ int xfrm_user_policy(struct sock *sk, int optname, u8 __user *optval, int optlen 
	struct xfrm_mgr *km;

	struct xfrm_policy *pol = NULL;



#ifdef CONFIG_COMPAT

	if (in_compat_syscall())

		return -EOPNOTSUPP;

#endif



	if (!optval && !optlen) {

		xfrm_sk_policy_insert(sk, XFRM_POLICY_IN, NULL);

net/xfrm/xfrm_user.c

+0 −2
Original line number Diff line number Diff line
@@ -2621,10 +2621,8 @@ static int xfrm_user_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh, 
	const struct xfrm_link *link;

	int type, err;



#ifdef CONFIG_COMPAT

	if (in_compat_syscall())

		return -EOPNOTSUPP;

#endif



	type = nlh->nlmsg_type;

	if (type > XFRM_MSG_MAX)