Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp592448pxb; Thu, 25 Feb 2021 09:56:01 -0800 (PST) X-Google-Smtp-Source: ABdhPJwdldJJ3XcIk7dZkAH2KN8hrxlmP+1wzmV1pImnPLNmfGpBOiVU8fS3SXxZ9JZY+eWHA6Xl X-Received: by 2002:a17:906:6047:: with SMTP id p7mr3756922ejj.400.1614275761061; Thu, 25 Feb 2021 09:56:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1614275761; cv=none; d=google.com; s=arc-20160816; b=V5P21mdYAoGi7QpI/SAxsamwxKzaJUV1UDlsOb+T28BXdRICMyOlCsvYMwo7oVunve YF1Y4pSIDyGTF1886Jq8OHJPw34SS/UvPeP0i6Cwom00FcrJ7PAnRkq1SFBYEbNjVVjw EFCNeNLAlXV5ndk3ImOIvZOhrLxOLAbiQe5LkS93sGHJG9aNrvw2kTTZgF7Qbse2Lfff 10TfO3ZV1LO4oRuK7MGWeirdHWJADXSploURT/a+VN2MSb+lP50UoLg/kvNnZrLqLEQQ AM24Raes72Y8g9YNQzub/ZfLXDxaVtINPsWy0Jl4lL1MszXx0bswEK4xX91MCIutD0BK yawg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:date:cc:to:subject:from:references:in-reply-to :message-id; bh=F5ieJ+4sSwmVZnor9q5qLzcXlpgwIZCePhu6WP0V/rw=; b=WshdarFDPh7TD9nfBQ2JYi4SmjKoeLFPZeAzmepHfpo7nyLk81JHIoVkKGbuu+sPzG Ik6aTtvogRN5GwILyWUZ+PjVu2sN8ZdFaFD6NmY/9FdukuQ6AF+fL7SN/d9o/eiTkExY H82ZhIz1x0tv4hBN55eSpoSEc+Zqe+6etFeBMBpp4SKoH9JOi0fRlNaD34MZupwSORbs jMH4UaHJmEoRyVAtPDK/j3tdRlJFqoIMUm9ym63OUdgpdKTLbgZn21aCR66v9yNbb2oH ghgRH3M9kMysT1xPhL9O5/HCFjBMlGhFOWcf26S/kfOHuod/3rtS9tyePGWGyNW9LWxS 0oHg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id hk1si4135285ejb.36.2021.02.25.09.55.37; Thu, 25 Feb 2021 09:56:01 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233167AbhBYRwx (ORCPT + 99 others); Thu, 25 Feb 2021 12:52:53 -0500 Received: from pegase1.c-s.fr ([93.17.236.30]:55971 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232557AbhBYRvT (ORCPT ); Thu, 25 Feb 2021 12:51:19 -0500 Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 4DmgLF3zHqz9v1B1; Thu, 25 Feb 2021 18:50:29 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at c-s.fr Received: from pegase1.c-s.fr ([192.168.12.234]) by localhost (pegase1.c-s.fr [192.168.12.234]) (amavisd-new, port 10024) with ESMTP id N_gD3E-k-nUz; Thu, 25 Feb 2021 18:50:29 +0100 (CET) Received: from messagerie.si.c-s.fr (messagerie.si.c-s.fr [192.168.25.192]) by pegase1.c-s.fr (Postfix) with ESMTP id 4DmgLF380Dz9v19y; Thu, 25 Feb 2021 18:50:29 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 435E28B895; Thu, 25 Feb 2021 18:50:31 +0100 (CET) X-Virus-Scanned: amavisd-new at c-s.fr Received: from messagerie.si.c-s.fr ([127.0.0.1]) by localhost (messagerie.si.c-s.fr [127.0.0.1]) (amavisd-new, port 10023) with ESMTP id xzWfidmHlRZR; Thu, 25 Feb 2021 18:50:31 +0100 (CET) Received: from po16121vm.idsi0.si.c-s.fr (unknown [192.168.4.90]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 0E72F8B88B; Thu, 25 Feb 2021 18:50:31 +0100 (CET) Received: by po16121vm.idsi0.si.c-s.fr (Postfix, from userid 0) id DF2EA67442; Thu, 25 Feb 2021 17:50:30 +0000 (UTC) Message-Id: In-Reply-To: References: From: Christophe Leroy Subject: [PATCH v1 01/15] powerpc/uaccess: Remove __get_user_allowed() and unsafe_op_wrap() To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Date: Thu, 25 Feb 2021 17:50:30 +0000 (UTC) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Those two macros have only one user which is unsafe_get_user(). Put everything in one place and remove them. Signed-off-by: Christophe Leroy --- arch/powerpc/include/asm/uaccess.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/powerpc/include/asm/uaccess.h b/arch/powerpc/include/asm/uaccess.h index 78e2a3990eab..8cbf3e3874f1 100644 --- a/arch/powerpc/include/asm/uaccess.h +++ b/arch/powerpc/include/asm/uaccess.h @@ -53,9 +53,6 @@ static inline bool __access_ok(unsigned long addr, unsigned long size) #define __put_user(x, ptr) \ __put_user_nocheck((__typeof__(*(ptr)))(x), (ptr), sizeof(*(ptr))) -#define __get_user_allowed(x, ptr) \ - __get_user_nocheck((x), (ptr), sizeof(*(ptr)), false) - #define __get_user_inatomic(x, ptr) \ __get_user_nosleep((x), (ptr), sizeof(*(ptr))) #define __put_user_inatomic(x, ptr) \ @@ -482,8 +479,11 @@ user_write_access_begin(const void __user *ptr, size_t len) #define user_write_access_begin user_write_access_begin #define user_write_access_end prevent_current_write_to_user -#define unsafe_op_wrap(op, err) do { if (unlikely(op)) goto err; } while (0) -#define unsafe_get_user(x, p, e) unsafe_op_wrap(__get_user_allowed(x, p), e) +#define unsafe_get_user(x, p, e) do { \ + if (unlikely(__get_user_nocheck((x), (p), sizeof(*(p)), false)))\ + goto e; \ +} while (0) + #define unsafe_put_user(x, p, e) \ __unsafe_put_user_goto((__typeof__(*(p)))(x), (p), sizeof(*(p)), e) -- 2.25.0