From patchwork Fri Oct 12 13:42:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Safonov X-Patchwork-Id: 983064 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=quarantine dis=none) header.from=arista.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=arista.com header.i=@arista.com header.b="onSQ6vDG"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42Wptw6NDyz9s3C for ; Sat, 13 Oct 2018 00:43:04 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728778AbeJLVPc (ORCPT ); Fri, 12 Oct 2018 17:15:32 -0400 Received: from mail-ed1-f67.google.com ([209.85.208.67]:41411 "EHLO mail-ed1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728576AbeJLVPb (ORCPT ); Fri, 12 Oct 2018 17:15:31 -0400 Received: by mail-ed1-f67.google.com with SMTP id x31-v6so11520457edd.8 for ; Fri, 12 Oct 2018 06:42:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=arista.com; s=googlenew; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=GHKRQfSzYcmlUqKtkMrjJRIg8df9+xe4ICJnJPR4NCo=; b=onSQ6vDGWoN1/D2aGnlR+935Ofc8T2MjkeAckv5H/m5IyA8E5uGLMB2CTxmR6bbwGD 3GiqI7/3u+hdjxnTJaTkApKNtC1qdkIAF05CfGzWsAKWe4yZfJKoV0JF83e3szI4eEfw SVm3ejsUbXNNfOd9094iB/9jvQ+BUGBT2qkVPwgAC46UxyeXibn/qmURENTAtSDjT7Vc UvNV/L39DmfUbh/e1Wh/lFF2Vo5pPVKZwG6UMkVQdzmz955Zsspd733YwYT+EW9aAq8P 2QbhJh3lSPnr2OR6IMbKT8QxtqI9XeCSiKysTjdG8+Xe8ZvFY+/PNmIMmoZTYqXlX96M USCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=GHKRQfSzYcmlUqKtkMrjJRIg8df9+xe4ICJnJPR4NCo=; b=Yo3MoyUDoFCV5bAEMiJ0gY6JDG88P+sgT+L1nRj5agq6LYNjBLOlJiykh0GnvM2Qj6 UUDhvFxylNdQFu5ylNfOvTx4gaRB9+YgetgXhzDJ833PjU1rgpt2K54FJxv5O2LbQxst wqCwT3rSbLX1DKdlIPJTri87av208eprLm8YDjPNwtddvAveHjxoo6PzrLB+G3RglaLV VvsS2w0LjReTN1p9DMglQFYlxaK8+eESa1gguQRfWvM55wY7feF8H2rYl/TawZKyk3x7 Km59TO2PDH7i32IfTPIxVSK3HXewvpN7goHds2tf4wsjVDuTEHvp6PiXO5flVPlJjL4g YSuA== X-Gm-Message-State: ABuFfogFK0QEmZgQR0lO/N084aTdqvY10IVkYfJ8Pisf9LPMcT7K5rks qGyoydRHzhCFj2k63db6YUfbJQ== X-Google-Smtp-Source: ACcGV632WGmWIdG5TO2empAL9bQZQASgNAJgaENR2pmJ2N8W9qlMpeoW+p1RPP/SLHUE8VMpbI1bDA== X-Received: by 2002:a17:906:4054:: with SMTP id y20-v6mr7247353ejj.30.1539351777768; Fri, 12 Oct 2018 06:42:57 -0700 (PDT) Received: from dhcp.ire.aristanetworks.com ([217.173.96.166]) by smtp.gmail.com with ESMTPSA id k42-v6sm577292ede.94.2018.10.12.06.42.56 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 12 Oct 2018 06:42:57 -0700 (PDT) From: Dmitry Safonov To: linux-kernel@vger.kernel.org Cc: Dmitry Safonov <0x7f454c46@gmail.com>, Dmitry Safonov , Ard Biesheuvel , Andy Lutomirsky , "David S. Miller" , Herbert Xu , "H. Peter Anvin" , Ingo Molnar , John Stultz , "Kirill A. Shutemov" , Oleg Nesterov , Steffen Klassert , Stephen Boyd , Steven Rostedt , Thomas Gleixner , x86@kernel.org, linux-efi@vger.kernel.org, netdev@vger.kernel.org Subject: [RFC-resend 2/2] compat: Cleanup in_compat_syscall() callers Date: Fri, 12 Oct 2018 14:42:53 +0100 Message-Id: <20181012134253.23266-3-dima@arista.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20181012134253.23266-1-dima@arista.com> References: <20181012134253.23266-1-dima@arista.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Now that in_compat_syscall() == false on native i686, it's possible to remove some ifdeffery and no more needed helpers. Signed-off-by: Dmitry Safonov --- drivers/firmware/efi/efivars.c | 16 ++++------------ kernel/time/time.c | 2 +- net/xfrm/xfrm_state.c | 2 -- net/xfrm/xfrm_user.c | 2 -- 4 files changed, 5 insertions(+), 17 deletions(-) diff --git a/drivers/firmware/efi/efivars.c b/drivers/firmware/efi/efivars.c index 3e626fd9bd4e..8061667a6765 100644 --- a/drivers/firmware/efi/efivars.c +++ b/drivers/firmware/efi/efivars.c @@ -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; diff --git a/kernel/time/time.c b/kernel/time/time.c index ccdb351277ee..4638e8cb6378 100644 --- a/kernel/time/time.c +++ b/kernel/time/time.c @@ -863,7 +863,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; diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c index b669262682c9..dc4a9f1fb941 100644 --- a/net/xfrm/xfrm_state.c +++ b/net/xfrm/xfrm_state.c @@ -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); diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c index df7ca2dabc48..c3aedf8a99ff 100644 --- a/net/xfrm/xfrm_user.c +++ b/net/xfrm/xfrm_user.c @@ -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)