Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp476906pxf; Wed, 10 Mar 2021 09:58:31 -0800 (PST) X-Google-Smtp-Source: ABdhPJzSsbw5LJojuphZnecM0f9jxpfbg/mvMqFukPbPucJA26ie3RICEtR9D3tyN+zwoaqiwLmc X-Received: by 2002:a05:6402:13ce:: with SMTP id a14mr4702922edx.365.1615399111515; Wed, 10 Mar 2021 09:58:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1615399111; cv=none; d=google.com; s=arc-20160816; b=EsGh9reSMo/BmBWxkqvyWKM1tzoJxkO0QN4nwEDFQlNHjXaFw64iF7u/hzsVuNgJ0e yA2YXDz9X8clnFUpQq2ROcRbblhyQf+YU49vYSfRGTb/PNa8F+W2N9YM5+DY1hICiKFf RLdOhglTTH8FYusp7VJlSGS9FgjlkpoppT11Q6RPGQ/0NPrRWrlYSGj2aDk2/nNssWwq kl4HNIKz9Vq39cBjqlhWqQz06bA7PonnXHOb9+1oP2j+DOz445QKyI0aafs2eXgPVsjM D/Nd+ZDGvuyfquf7LLRGZFp82plC16nZlsTd+dWISL63zykNwXBvbtvqFR2k0E89Kxt/ Tu9A== 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=m1Ny89Qd/BN1A8IDZC9StA+pkIGTz31D2gzd9T1pLrA=; b=ThLdryknC7Q5vui0x+p36wYA4uStQ7PrkNqAsX2UdaMBoreGvsAlRSyKozUyuBG/62 2J9YolNv+RNf8JwyFX6fd7lRCMzcyOOcSFgr0utaE6ETp3zGvXwf/hZyjZgOYbxaEwJx X/Y3tmvQ4cOGTA8S6G+NNYG2ger9FaB3FK18MdxHT/JWcqVjH+YrT5hf+7GrCiWwHDQS 45lDNFQl3wyvh4byHKmgdl4SAvg+oj4+ZsF86UsveDYUpFPbbdq5poPi+dtmIdskwo29 3R21FACn0KkYoe6vrMIAQf52sdvqCF0TmqNxbBGNGO+JUwAu5dPzSDdLZuYolrc046K2 WyVQ== 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 y6si42878ejp.143.2021.03.10.09.58.08; Wed, 10 Mar 2021 09:58:31 -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 S232846AbhCJR5P (ORCPT + 99 others); Wed, 10 Mar 2021 12:57:15 -0500 Received: from pegase1.c-s.fr ([93.17.236.30]:23216 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232809AbhCJR5D (ORCPT ); Wed, 10 Mar 2021 12:57:03 -0500 Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 4Dwfsm6yTHz9tyv7; Wed, 10 Mar 2021 18:57:00 +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 XlBJvvFHkHRe; Wed, 10 Mar 2021 18:57:00 +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 4Dwfsm55CNz9tytT; Wed, 10 Mar 2021 18:57:00 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 7D3728B78D; Wed, 10 Mar 2021 18:57:02 +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 6d3exhKAqAss; Wed, 10 Mar 2021 18:57:02 +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 2A0178B77E; Wed, 10 Mar 2021 18:57:02 +0100 (CET) Received: by po16121vm.idsi0.si.c-s.fr (Postfix, from userid 0) id 801CC6756B; Wed, 10 Mar 2021 17:57:01 +0000 (UTC) Message-Id: In-Reply-To: References: From: Christophe Leroy Subject: [PATCH v1 2/8] powerpc/uaccess: Swap clear_user() and __clear_user() To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Date: Wed, 10 Mar 2021 17:57:01 +0000 (UTC) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org It is clear_user() which is expected to call __clear_user(), not the reverse. Signed-off-by: Christophe Leroy --- arch/powerpc/include/asm/uaccess.h | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/arch/powerpc/include/asm/uaccess.h b/arch/powerpc/include/asm/uaccess.h index 2c09cff205ef..1c1d404514b1 100644 --- a/arch/powerpc/include/asm/uaccess.h +++ b/arch/powerpc/include/asm/uaccess.h @@ -414,21 +414,20 @@ raw_copy_to_user(void __user *to, const void *from, unsigned long n) unsigned long __arch_clear_user(void __user *addr, unsigned long size); -static inline unsigned long clear_user(void __user *addr, unsigned long size) +static inline unsigned long __clear_user(void __user *addr, unsigned long size) { - unsigned long ret = size; + unsigned long ret; + might_fault(); - if (likely(access_ok(addr, size))) { - allow_write_to_user(addr, size); - ret = __arch_clear_user(addr, size); - prevent_write_to_user(addr, size); - } + allow_write_to_user(addr, size); + ret = __arch_clear_user(addr, size); + prevent_write_to_user(addr, size); return ret; } -static inline unsigned long __clear_user(void __user *addr, unsigned long size) +static inline unsigned long clear_user(void __user *addr, unsigned long size) { - return clear_user(addr, size); + return likely(access_ok(addr, size)) ? __clear_user(addr, size) : size; } extern long strncpy_from_user(char *dst, const char __user *src, long count); -- 2.25.0