Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp511176pxb; Tue, 9 Feb 2021 06:10:07 -0800 (PST) X-Google-Smtp-Source: ABdhPJz2dDr6zhjrHtiDEwxjdzLM3GfrjN/5WmO97LkZ5B+ZrCb+VcnHc9SnOuMd6f+a4KF94L79 X-Received: by 2002:a05:6402:19:: with SMTP id d25mr11448485edu.71.1612879807639; Tue, 09 Feb 2021 06:10:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1612879807; cv=none; d=google.com; s=arc-20160816; b=GDg7ydgTxmv7P8QRbrPuLT/wnPXK2/Upl9aYKjlOEoo47H5SCWYusHrESP+o5vYI7S ouD5jTzMAUH975VQu9E1ycEAsoC8N2LcSStyM1STfVfaK1bwzPzcHWQjwqdIUCVEAiDn OvpMSKgl76zxVJ8aoYVVzkCnI+jRWIAAgnE3k1LZQSaSBlJGUgYZRV2fyObwojp9MdgI giuRtzx9nWnCQj/qEyR+/yD3n/gw8SIq78SJyx0kB6AamKk9i28ZsaHGTYTc0gWIk5hQ uqt0XqwWTPT3R1u1hMlEZ1+imUg/da0YmU03BW5V7lyK4w9Vj5IbqKoG4vftVvY0ORpn FU+w== 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=OG9n/3b1+k7YoaYopkGkgrMlUV7gYpONi5P2IN1ifF0=; b=UEjnaX0vBq9rmRgeQ31eppNNhzdHCFrE2Mk4g/u4tUwkBG5gOxJLz1l/qlKPAy0ZIC V3q8gmBgq1K3KzuFo+KcsoMfY9b186WuJR/P1p1i4g8Geld2ngsSt1J+ZWCwbSjjSZTX nTm0xkes90Lt3ColSiRm8aLtO5BiUwiVa+Yy0KkfMpBCZYGIKYpJXDhP64cykp6ANKyj UqWdSBZYSPsDJ6V1a4EyfOsB+wAPmEQegSiN2yh0PggxEUWnXmti5cY90paCGUkEp52g IJXPlxsTm6tPrW0EfpDlbnqsIiOtF1V9MQyNxyEZTe+xPNQGHbUWLBKM5HbIsDvoYCWA j0fg== 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 p10si4393424ejg.218.2021.02.09.06.09.33; Tue, 09 Feb 2021 06:10:07 -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 S230177AbhBIOE5 (ORCPT + 99 others); Tue, 9 Feb 2021 09:04:57 -0500 Received: from pegase1.c-s.fr ([93.17.236.30]:34401 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231962AbhBIODE (ORCPT ); Tue, 9 Feb 2021 09:03:04 -0500 Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 4DZl2F0ybHz9v0KC; Tue, 9 Feb 2021 15:02:13 +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 jNqtz1LhUB_Z; Tue, 9 Feb 2021 15:02:13 +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 4DZl2F07yDz9v0KB; Tue, 9 Feb 2021 15:02:13 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 281828B7E8; Tue, 9 Feb 2021 15:02:14 +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 h52ZIj1BeRTs; Tue, 9 Feb 2021 15:02:14 +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 B91D98B764; Tue, 9 Feb 2021 15:02:13 +0100 (CET) Received: by po16121vm.idsi0.si.c-s.fr (Postfix, from userid 0) id 92DFA67359; Tue, 9 Feb 2021 14:02:13 +0000 (UTC) Message-Id: In-Reply-To: <99d4ccb58a20d8408d0e19874393655ad5b40822.1612879284.git.christophe.leroy@csgroup.eu> References: <99d4ccb58a20d8408d0e19874393655ad5b40822.1612879284.git.christophe.leroy@csgroup.eu> From: Christophe Leroy Subject: [PATCH v2 2/3] powerpc/uaccess: Merge __put_user_size_allowed() into __put_user_size() To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Date: Tue, 9 Feb 2021 14:02:13 +0000 (UTC) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org __put_user_size_allowed() is only called from __put_user_size() now. Merge them together. Signed-off-by: Christophe Leroy --- arch/powerpc/include/asm/uaccess.h | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/arch/powerpc/include/asm/uaccess.h b/arch/powerpc/include/asm/uaccess.h index a4d2569173ac..2fb1d95f10d3 100644 --- a/arch/powerpc/include/asm/uaccess.h +++ b/arch/powerpc/include/asm/uaccess.h @@ -108,22 +108,18 @@ static inline bool __access_ok(unsigned long addr, unsigned long size) extern long __put_user_bad(void); -#define __put_user_size_allowed(x, ptr, size, retval) \ +#define __put_user_size(x, ptr, size, retval) \ do { \ __label__ __pu_failed; \ \ retval = 0; \ + allow_write_to_user(ptr, size); \ __put_user_size_goto(x, ptr, size, __pu_failed); \ + prevent_write_to_user(ptr, size); \ break; \ \ __pu_failed: \ retval = -EFAULT; \ -} while (0) - -#define __put_user_size(x, ptr, size, retval) \ -do { \ - allow_write_to_user(ptr, size); \ - __put_user_size_allowed(x, ptr, size, retval); \ prevent_write_to_user(ptr, size); \ } while (0) -- 2.25.0