Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp472008pxf; Wed, 10 Mar 2021 09:52:17 -0800 (PST) X-Google-Smtp-Source: ABdhPJz0RRmuxeTIJLXx/6NqPNIlaW3/pY/n6QIQnG3/PFWmkdJCprhnuEs+aL3fgdP1GmOCsQuQ X-Received: by 2002:a17:906:9888:: with SMTP id zc8mr5058571ejb.310.1615398736859; Wed, 10 Mar 2021 09:52:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1615398736; cv=none; d=google.com; s=arc-20160816; b=pgxt2ueHf5tisDhJr+lLDbYoGK3vl+TiDbD3OMnyoxWNbo5eo8vBEwL3VQb1GbGlO9 lVNaDGjfCBgtxNpiQrulX1kr5pvrFJ1ylXHKgRJmzl/E4JltB2QU5J9e1oRsYVbmtOG7 vlI22faZVLnPuDbZQYKQewTLz1kvElsSzp5IqW5Gmvn0Kyp769RjmBPjWzp+oSM7ItJB iwLmJrMmQE3bD8tMM98ZVX9aSkOv0srr3WTMCDoflFhskazxrCbIC5YaO6nOghbbFg2M OO0iDm28nL/XFkYBD8AKqHrWASsoi6Ue8WcJXsiivS3SDLH1QnEF4JsLvCZ1769jSSXr 00GA== 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=6iASBShgWDQh/4s1PYkgcjajjCCp9SIjB/RT/nFJDaQ=; b=D0I9KOImxEAndv9r4U61hiMkTOQ0Kf/4EEqtTy6Uf4+OftAsbYcll5K1flMrFJFQlp PuZl6SX5/dzg2KTHR3cJBuTFoSJdCXQ4SR0UCZnrNDvBli4vkdRxTFWlCXAF0u2SzK/V zl0jQAA1pNy05u3v+aCJtQUKno8JX/nNSKmbtmRnjI7+ZH0aXv1DYzyAAl6JKy5YAKK0 bbP0O92t237WoJs9Eapm/ofB8PTvoPBuwbXW4raLJrqM40fvDAFRmzjGzyxaWeAdtijj Rq0L/y42DRr3mNn/JwbxZgsij1gD8oSgdb/qgc1DV+2+Z0T3bVsIkG0KPCq43S8MKxnf 1c9A== 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 c8si106936edj.174.2021.03.10.09.51.53; Wed, 10 Mar 2021 09:52:16 -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 S233658AbhCJRrf (ORCPT + 99 others); Wed, 10 Mar 2021 12:47:35 -0500 Received: from pegase1.c-s.fr ([93.17.236.30]:3719 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233569AbhCJRqz (ORCPT ); Wed, 10 Mar 2021 12:46:55 -0500 Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 4Dwff45XpSz9tyv7; Wed, 10 Mar 2021 18:46:52 +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 CbeIPE1Enk2P; Wed, 10 Mar 2021 18:46:52 +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 4Dwff43x90z9tytH; Wed, 10 Mar 2021 18:46:52 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 4EA218B78D; Wed, 10 Mar 2021 18:46:54 +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 r1PsR-B0Xn9t; Wed, 10 Mar 2021 18:46:54 +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 1CCFE8B77E; Wed, 10 Mar 2021 18:46:54 +0100 (CET) Received: by po16121vm.idsi0.si.c-s.fr (Postfix, from userid 0) id E084767568; Wed, 10 Mar 2021 17:46:53 +0000 (UTC) Message-Id: In-Reply-To: References: From: Christophe Leroy Subject: [PATCH v2 14/15] powerpc/uaccess: Introduce __get_user_size_goto() 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:53 +0000 (UTC) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org We have got two places doing a goto based on the result of __get_user_size_allowed(). Refactor that into __get_user_size_goto(). Signed-off-by: Christophe Leroy --- arch/powerpc/include/asm/uaccess.h | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/arch/powerpc/include/asm/uaccess.h b/arch/powerpc/include/asm/uaccess.h index 671c083f2f2f..e3e53e88cb26 100644 --- a/arch/powerpc/include/asm/uaccess.h +++ b/arch/powerpc/include/asm/uaccess.h @@ -183,6 +183,15 @@ do { \ } \ } while (0) +#define __get_user_size_goto(x, ptr, size, label) \ +do { \ + long __gus_retval; \ + \ + __get_user_size_allowed(x, ptr, size, __gus_retval); \ + if (__gus_retval) \ + goto label; \ +} while (0) + /* * This is a type: either unsigned long, if the argument fits into * that type, or otherwise unsigned long long. @@ -352,13 +361,10 @@ user_write_access_begin(const void __user *ptr, size_t len) #define user_write_access_end prevent_current_write_to_user #define unsafe_get_user(x, p, e) do { \ - long __gu_err; \ __long_type(*(p)) __gu_val; \ __typeof__(*(p)) __user *__gu_addr = (p); \ \ - __get_user_size_allowed(__gu_val, __gu_addr, sizeof(*(p)), __gu_err); \ - if (__gu_err) \ - goto e; \ + __get_user_size_goto(__gu_val, __gu_addr, sizeof(*(p)), e); \ (x) = (__typeof__(*(p)))__gu_val; \ } while (0) @@ -389,14 +395,8 @@ do { \ #define HAVE_GET_KERNEL_NOFAULT #define __get_kernel_nofault(dst, src, type, err_label) \ -do { \ - int __kr_err; \ - \ - __get_user_size_allowed(*((type *)(dst)), (__force type __user *)(src),\ - sizeof(type), __kr_err); \ - if (unlikely(__kr_err)) \ - goto err_label; \ -} while (0) + __get_user_size_goto(*((type *)(dst)), \ + (__force type __user *)(src), sizeof(type), err_label) #define __put_kernel_nofault(dst, src, type, err_label) \ __put_user_size_goto(*((type *)(src)), \ -- 2.25.0