Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp476905pxf; Wed, 10 Mar 2021 09:58:31 -0800 (PST) X-Google-Smtp-Source: ABdhPJx55nlptztMYhKh39ZLYbuQ28mOXsbpqm52J5GGbs6gLV6hFPLFEPzl++70vLVjcbP0AhlO X-Received: by 2002:a05:6402:1517:: with SMTP id f23mr4768254edw.272.1615399111426; 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=tu6tS6ARa2hhQKHFzclqmpW47E6+jRNwpSG+osoANd1mXQpN6o806wTvh6ZOq69dda W0/1DRsHAGuxOw30vTXn7nZ8Q6jlQstpu/szuCbGpGEmqvOoxEm7BewfDBuGj10Q7hOi 3OVtHh+k059/srfvVGjZHZ1VifEOnEwpFOP19MPNBcziXyricvQ3KEIbSSU8CAfbjDII 1WcqCyH84pNNw3eX501phA1AVEL+osBNemWseNPrLsz8NChZ1VEooGmw4m2fWHqpeD3v ehPL1Jw9ZPRs+TK6a4BSFAAPhCsu/3L53gDz1JpmF4OFwfJvuiuIIa/huObVkUUMdVT9 0WuQ== 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=EEgQb1Hjmyij6UEOEFjXdAghcPk293g9+QLIvzHSIPA=; b=ffblF5uzuvDwinAosPS2FNCuhwk54W4zhIX1PBrO75y3L6HuZdBfPPbjI+asa6L5gj ZZ566aVulXsXysPIRcwl6OrtI2cuzE9zHfVWx1uwsqet3FVobSBMdThA3X1xjbGygXLZ vfEKvnkwz2CGvsv48nEn3LTBRCCmEoEYWoMKV8BAhPA9AXZCEqGi52it3Uaa5V4pn4hI mOkTX/evC57quBRjfliiRb1AODn0FzdK7QtaZjIRU4rIMX4aqhOSIzuRxV4Fyqp8MQsE ZDUW1T/eTbtx0TYqxlA0OZnzr61+PKppUhb4YjZr3iKeTyPPq05tzN28zZsrSF9vrF1D BztA== 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 z15si117667edm.187.2021.03.10.09.58.09; 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 S233425AbhCJR5T (ORCPT + 99 others); Wed, 10 Mar 2021 12:57:19 -0500 Received: from pegase1.c-s.fr ([93.17.236.30]:60148 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233354AbhCJR5G (ORCPT ); Wed, 10 Mar 2021 12:57:06 -0500 Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 4Dwfsp6CwJz9v04R; Wed, 10 Mar 2021 18:57:02 +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 RSmSeYYwqfjB; Wed, 10 Mar 2021 18:57:02 +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 4Dwfsp5Cthz9tytT; Wed, 10 Mar 2021 18:57:02 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 90B508B78D; Wed, 10 Mar 2021 18:57:04 +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 C2GPI0QuFZJi; Wed, 10 Mar 2021 18:57:04 +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 239268B77E; Wed, 10 Mar 2021 18:57:04 +0100 (CET) Received: by po16121vm.idsi0.si.c-s.fr (Postfix, from userid 0) id 8CFDD6756B; Wed, 10 Mar 2021 17:57:03 +0000 (UTC) Message-Id: <4de983ad254739da1fe6e9f273baf387b7043ae0.1615398498.git.christophe.leroy@csgroup.eu> In-Reply-To: References: From: Christophe Leroy Subject: [PATCH v1 4/8] powerpc/syscalls: Use sys_old_select() in ppc_select() 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:03 +0000 (UTC) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Instead of opencodying the copy of parameters, use the generic sys_old_select(). Signed-off-by: Christophe Leroy --- arch/powerpc/include/asm/unistd.h | 1 + arch/powerpc/kernel/syscalls.c | 12 ++---------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/arch/powerpc/include/asm/unistd.h b/arch/powerpc/include/asm/unistd.h index 700fcdac2e3c..b541c690a31c 100644 --- a/arch/powerpc/include/asm/unistd.h +++ b/arch/powerpc/include/asm/unistd.h @@ -40,6 +40,7 @@ #define __ARCH_WANT_SYS_SIGPROCMASK #ifdef CONFIG_PPC32 #define __ARCH_WANT_OLD_STAT +#define __ARCH_WANT_SYS_OLD_SELECT #endif #ifdef CONFIG_PPC64 #define __ARCH_WANT_SYS_TIME diff --git a/arch/powerpc/kernel/syscalls.c b/arch/powerpc/kernel/syscalls.c index 078608ec2e92..a552c9e68d7e 100644 --- a/arch/powerpc/kernel/syscalls.c +++ b/arch/powerpc/kernel/syscalls.c @@ -82,16 +82,8 @@ int ppc_select(int n, fd_set __user *inp, fd_set __user *outp, fd_set __user *exp, struct __kernel_old_timeval __user *tvp) { if ( (unsigned long)n >= 4096 ) - { - unsigned long __user *buffer = (unsigned long __user *)n; - if (!access_ok(buffer, 5*sizeof(unsigned long)) - || __get_user(n, buffer) - || __get_user(inp, ((fd_set __user * __user *)(buffer+1))) - || __get_user(outp, ((fd_set __user * __user *)(buffer+2))) - || __get_user(exp, ((fd_set __user * __user *)(buffer+3))) - || __get_user(tvp, ((struct __kernel_old_timeval __user * __user *)(buffer+4)))) - return -EFAULT; - } + return sys_old_select((void __user *)n); + return sys_select(n, inp, outp, exp, tvp); } #endif -- 2.25.0