Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp478889pxf; Wed, 10 Mar 2021 10:00:57 -0800 (PST) X-Google-Smtp-Source: ABdhPJxT/hurEJyHQ3PRdW1jPZs2dV4VqpPQLh8uHoRMGJVCXFlxaR/G0gLTaRx0pcMA4KcUXt+i X-Received: by 2002:a17:906:2743:: with SMTP id a3mr5006399ejd.378.1615399256926; Wed, 10 Mar 2021 10:00:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1615399256; cv=none; d=google.com; s=arc-20160816; b=MJzdysmW7RuG1bDubz9sZVZWQCcAGRtLlK377PSyYdjDauSlk7kVEhGjAz37V3U0Nh lFKsydBeU+XFJ3XP7L3pvnYrBkshpxVVzyy7vaaX3XC8jb6AYid4az/z+a9j8ISxJAIl hOVdvCXGMwEwwjA29dB5jmn2+sYKC+Mqw9vRH8ySA7QBOKeMD2QmvPgkrAeiUVxkI+S8 Yv34XeymzyIpTW/aiVzySLnuWFj2QsvivpRSt/IH34YP85y6xdRpnjVz1r3CSQ1mgWBd xLI7MtGa4RLxXINlsY5jUws1AIlQyNP+gnDaw5SllezEweOBQSmRJnMHRahxM8/yE07j cjcg== 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=sfCmhA80DiH8kCPPXG1NjwiDnaAyl3w1EZu/QCiQ2zE=; b=X7ZYvytq1J9J1AquRjKv7WHt3bB1yiA4Qnz08F207fZCW6BDasoAg3r5r/v39tHrDx ZEJfm5fChCPBCk5c3KjbCxWZDreQuhLe1hxIGNNtkOuvi4mUceseBn2/cHmvMewjMYWs 0JZAEKEYCEpmhG78ba3FXWcWk6jccfPM4z6fc7cIeVebM6WyxUcmLZRN2QnQQvs/t6Z/ kUZHNyGQnlrRRBWlJX+V//HUjGGaspvUSDb/6IZzjvKwG9UHtHbUodtM2pKZ2TifNB5t sXpBK/xjAsh9ZKSHduYb4cVudSinYJVm5/JKEGQcdwm2/MLZ+VDl4YJbD0DP6NbMnpBF Jhng== 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 hd42si30993ejc.727.2021.03.10.10.00.33; Wed, 10 Mar 2021 10:00:56 -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 S233493AbhCJR5V (ORCPT + 99 others); Wed, 10 Mar 2021 12:57:21 -0500 Received: from pegase1.c-s.fr ([93.17.236.30]:25880 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233406AbhCJR5I (ORCPT ); Wed, 10 Mar 2021 12:57:08 -0500 Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 4Dwfss6jfXzB09Zd; Wed, 10 Mar 2021 18:57:05 +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 YagTIsKA6u6g; Wed, 10 Mar 2021 18:57:05 +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 4Dwfss5mllz9tytT; Wed, 10 Mar 2021 18:57:05 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id A163A8B78D; Wed, 10 Mar 2021 18:57:07 +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 xBOPPdddCg7U; Wed, 10 Mar 2021 18:57:07 +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 51BF98B77E; Wed, 10 Mar 2021 18:57:07 +0100 (CET) Received: by po16121vm.idsi0.si.c-s.fr (Postfix, from userid 0) id A53CF6756B; Wed, 10 Mar 2021 17:57:06 +0000 (UTC) Message-Id: <6cd202cdc4f939d47822e4ddd3c0856210431a58.1615398498.git.christophe.leroy@csgroup.eu> In-Reply-To: References: From: Christophe Leroy Subject: [PATCH v1 7/8] powerpc/futex: Switch to user_access block 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:06 +0000 (UTC) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use user_access_begin() instead of the access_ok/allow_access sequence. This brings the missing might_fault() check. Signed-off-by: Christophe Leroy --- arch/powerpc/include/asm/futex.h | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/arch/powerpc/include/asm/futex.h b/arch/powerpc/include/asm/futex.h index e93ee3202e4c..b3001f8b2c1e 100644 --- a/arch/powerpc/include/asm/futex.h +++ b/arch/powerpc/include/asm/futex.h @@ -33,9 +33,8 @@ static inline int arch_futex_atomic_op_inuser(int op, int oparg, int *oval, { int oldval = 0, ret; - if (!access_ok(uaddr, sizeof(u32))) + if (!user_access_begin(uaddr, sizeof(u32))) return -EFAULT; - allow_read_write_user(uaddr, uaddr, sizeof(*uaddr)); switch (op) { case FUTEX_OP_SET: @@ -56,10 +55,10 @@ static inline int arch_futex_atomic_op_inuser(int op, int oparg, int *oval, default: ret = -ENOSYS; } + user_access_end(); *oval = oldval; - prevent_read_write_user(uaddr, uaddr, sizeof(*uaddr)); return ret; } @@ -70,11 +69,9 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr, int ret = 0; u32 prev; - if (!access_ok(uaddr, sizeof(u32))) + if (!user_access_begin(uaddr, sizeof(u32))) return -EFAULT; - allow_read_write_user(uaddr, uaddr, sizeof(*uaddr)); - __asm__ __volatile__ ( PPC_ATOMIC_ENTRY_BARRIER "1: lwarx %1,0,%3 # futex_atomic_cmpxchg_inatomic\n\ @@ -93,8 +90,9 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr, : "r" (uaddr), "r" (oldval), "r" (newval), "i" (-EFAULT) : "cc", "memory"); + user_access_end(); + *uval = prev; - prevent_read_write_user(uaddr, uaddr, sizeof(*uaddr)); return ret; } -- 2.25.0