Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp471081pxf; Wed, 10 Mar 2021 09:51:09 -0800 (PST) X-Google-Smtp-Source: ABdhPJyKw8G021WG4on8EzyGGQF7KrAOrIaPkQrG8IbJXx+9eCciypjHQWnSbM7ffZZiehEZ+j/Y X-Received: by 2002:a17:906:7c44:: with SMTP id g4mr4785869ejp.269.1615398669555; Wed, 10 Mar 2021 09:51:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1615398669; cv=none; d=google.com; s=arc-20160816; b=sGNZP5Omi1pdh0lQZot6V92bqAunIW3cw6GFDSCtbYkwndBSWDU8SGdIfDB6MJNWzZ A+oU12ishNMIskR3OKH7nTon0Mum5qLmi+5gWpquftSR+7A84FqjGS4HZHbIWrsZ8tsm NopCX9iQ8nDQSQzyXzmPCyufuAoaE0IezLGRiMm82hTYHjzaE8mvDFiAM+r3wUQHXm3O iXiQlFexkLC3maabbMrjEOyYX4TqOJKkdcgpxe4xM9ZMNkWh/oSzOU7iRN92oN+SHaLF KbIUP21UohApt3jw2mQsKzFV68Dqk81QSqGEXOiA/l6dR6GJcR+czURAPCyk2Spn3MdJ gWDA== 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=GiihUKZ1KSjDjmgNjdMWUWTsS+Wde+SGURcbes2j+Q+HbWBDi+kw20iOPSepteZSZP dZNbSZhzmBecLbOIc77xBkTh0HWKYnn3HLvHfqOT22zeP8AagTzRTIICS+5U/szSovla 1AheN5WmTU7qoEbp45ur9X5kUNwDQUCK+zRw5hY3Cf73TCZS5bEY1pRH0j0b6fT8m/9q skotYuygWab1tET2XS2joCpMZhdqKM8jEzwjRiblHlFIMA09hmk4lJUw8D5Yw006xxxp d2KXQgRmkyZi2Wy2w+Adoa2YBH0h9x5MZucEgde87YRy8sTqyRSgSe7HgQ1GpLLWTNzl S0Bg== 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 ly13si22926ejb.649.2021.03.10.09.50.47; Wed, 10 Mar 2021 09:51:09 -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 S233741AbhCJRrP (ORCPT + 99 others); Wed, 10 Mar 2021 12:47:15 -0500 Received: from pegase1.c-s.fr ([93.17.236.30]:50749 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233516AbhCJRqo (ORCPT ); Wed, 10 Mar 2021 12:46:44 -0500 Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 4Dwfdq17RJz9tytT; Wed, 10 Mar 2021 18:46:39 +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 vXkdbFcQnlKL; Wed, 10 Mar 2021 18:46:39 +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 4Dwfdp6xP6z9tytQ; Wed, 10 Mar 2021 18:46:38 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id C78718B78D; Wed, 10 Mar 2021 18:46:40 +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 VZHKbDJcEICP; Wed, 10 Mar 2021 18:46:40 +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 9469D8B77E; Wed, 10 Mar 2021 18:46:40 +0100 (CET) Received: by po16121vm.idsi0.si.c-s.fr (Postfix, from userid 0) id 73BD867568; Wed, 10 Mar 2021 17:46:40 +0000 (UTC) Message-Id: <439179c5e54c18f2cb8bdf1eea13ea0ef6b98375.1615398265.git.christophe.leroy@csgroup.eu> In-Reply-To: References: From: Christophe Leroy Subject: [PATCH v2 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: Wed, 10 Mar 2021 17:46:40 +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