From patchwork Mon Jul 26 14:11:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 485819 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp3864949jao; Mon, 26 Jul 2021 07:12:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxSez5lAQJvmJYUXUNTJ87E0WaBrNke2GGRPpuNOQkxJwBwd+Ze9d45P7W+2lXPPFp1RKHx X-Received: by 2002:a05:6638:c9:: with SMTP id w9mr16477804jao.133.1627308722593; Mon, 26 Jul 2021 07:12:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627308722; cv=none; d=google.com; s=arc-20160816; b=Y8l9x6qkcJLdurzVOsSPMfqlOX7gBlzSI2Y6M10Wmz2zdcgmZ4ZLbTe1TV60NRfSI0 nbpZ05LNHanD9+lNzIiLkpbW4+6L7322JzcNFH6BqSDQdiP0U/9Xr7QwsYveNkrG/T5O hkT3q6VbT+Yc3gF658V1b8E9tbkFRFGPiohomE/8Tnt3C9xAHaJ2yobh4/ClGpmEwzJW CEgH70OgjwhaheftkOmc1UBZjXsOX7Dk4c3i/hhcZpn9/48DsXFeqUx+TN9i9D/RfuQ/ 5rVLLJJmcR9YlGCzUAePqkeTNtWJV0dfTE9b2H6xor4UdFLC3nLXLfXSrX7nSuMeWSLY BlzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=vIfUGGtulgpC2KDB1aG2+FUeQY0n2oiUQtEjwRcFXUQ=; b=S8iG4X9YE5klhoyfvW90pPgtPlst9vgOl95309ldqYMjwWVZmGRZBBNzaiz1A1W658 ayBXrL4QK/qnOcKdeu5R3v98G+CSACtDTMebr0Y3AW1aZVsmfrIIwOckNOcQ3OyTwuvY z8bLi/jO089QRkOKifW4FYCxr/G7R4QFRuJz4s9FvA+VdztF+QF6qNtCOgRKL64iNJlr cMd4XgArQrdG9xSaOLnmrYURgG5cJmkIitPQ/l+kLfFC4YL+xeQ17MMaPt8zdP1Y9Sd2 6nQD2ID22+ljgIp51bLDy7PDAWdAPFLlpC4crtQ6Poif/dtwIfIEaJ43ifS4josMjO7E /2/g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=enQgq7GL; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id q5si60606ilt.55.2021.07.26.07.12.02; Mon, 26 Jul 2021 07:12:02 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=enQgq7GL; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234368AbhGZNbb (ORCPT + 12 others); Mon, 26 Jul 2021 09:31:31 -0400 Received: from mail.kernel.org ([198.145.29.99]:43014 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233498AbhGZNbY (ORCPT ); Mon, 26 Jul 2021 09:31:24 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 59AD260F58; Mon, 26 Jul 2021 14:11:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1627308713; bh=4CdKUxSFM8QMmxgntAsL2unQuopFIEx04zQkMcauFq4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=enQgq7GLY8oTWf5BlXKKn6AjVLAVJnsRPZVU21Onq3wXO0rnr/YiJXje6wFvdVmcR 648rl2EV1Vi7EaxRus7bgaIPs68p/cfVwQmhE8EgXM+bYHbtWu/iAoHJ7+PETztlmH PGC0oiUoQLt6+sTwu6cHHvHYHLX/caVJ7TcODIOpgzJgoKr40vkiWeaCh+Yt1ejKTf Yd33tdTZ+h+qXQqXIItpg7iHfpugtlc+pY7ZJ9EDoa4Go3fl1EQBwDvoLZMx9QNSxd faBmY6tzB4T1M1WqSfcSLwdbJtXmkFP2Y9aae0qLo/HIfxhWIVJvpYrAAO0MkF/gaD Zj+y4xj6fJtew== From: Arnd Bergmann To: Russell King Cc: Arnd Bergmann , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-arch@vger.kernel.org, linux-mm@kvack.org, Alexander Viro , Linus Walleij , stable@vger.kernel.org, Christoph Hellwig Subject: [PATCH v5 03/10] ARM: oabi-compat: add epoll_pwait handler Date: Mon, 26 Jul 2021 16:11:34 +0200 Message-Id: <20210726141141.2839385-4-arnd@kernel.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210726141141.2839385-1-arnd@kernel.org> References: <20210726141141.2839385-1-arnd@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Arnd Bergmann The epoll_wait() syscall has a special version for OABI compat mode to convert the arguments to the EABI structure layout of the kernel. However, the later epoll_pwait() syscall was added in arch/arm in linux-2.6.32 without this conversion. Use the same kind of handler for both. Fixes: 369842658a36 ("ARM: 5677/1: ARM support for TIF_RESTORE_SIGMASK/pselect6/ppoll/epoll_pwait") Cc: stable@vger.kernel.org Reviewed-by: Christoph Hellwig Signed-off-by: Arnd Bergmann --- arch/arm/kernel/sys_oabi-compat.c | 38 ++++++++++++++++++++++++++++--- arch/arm/tools/syscall.tbl | 2 +- 2 files changed, 36 insertions(+), 4 deletions(-) -- 2.29.2 diff --git a/arch/arm/kernel/sys_oabi-compat.c b/arch/arm/kernel/sys_oabi-compat.c index 075a2e0ed2c1..443203fafb6b 100644 --- a/arch/arm/kernel/sys_oabi-compat.c +++ b/arch/arm/kernel/sys_oabi-compat.c @@ -265,9 +265,8 @@ asmlinkage long sys_oabi_epoll_ctl(int epfd, int op, int fd, return do_epoll_ctl(epfd, op, fd, &kernel, false); } -asmlinkage long sys_oabi_epoll_wait(int epfd, - struct oabi_epoll_event __user *events, - int maxevents, int timeout) +static long do_oabi_epoll_wait(int epfd, struct oabi_epoll_event __user *events, + int maxevents, int timeout) { struct epoll_event *kbuf; struct oabi_epoll_event e; @@ -314,6 +313,39 @@ asmlinkage long sys_oabi_epoll_wait(int epfd, } #endif +SYSCALL_DEFINE4(oabi_epoll_wait, int, epfd, + struct oabi_epoll_event __user *, events, + int, maxevents, int, timeout) +{ + return do_oabi_epoll_wait(epfd, events, maxevents, timeout); +} + +/* + * Implement the event wait interface for the eventpoll file. It is the kernel + * part of the user space epoll_pwait(2). + */ +SYSCALL_DEFINE6(oabi_epoll_pwait, int, epfd, + struct oabi_epoll_event __user *, events, int, maxevents, + int, timeout, const sigset_t __user *, sigmask, + size_t, sigsetsize) +{ + int error; + + /* + * If the caller wants a certain signal mask to be set during the wait, + * we apply it here. + */ + error = set_user_sigmask(sigmask, sigsetsize); + if (error) + return error; + + error = do_oabi_epoll_wait(epfd, events, maxevents, timeout); + restore_saved_sigmask_unless(error == -EINTR); + + return error; +} +#endif + struct oabi_sembuf { unsigned short sem_num; short sem_op; diff --git a/arch/arm/tools/syscall.tbl b/arch/arm/tools/syscall.tbl index c5df1179fc5d..11d0b960b2c2 100644 --- a/arch/arm/tools/syscall.tbl +++ b/arch/arm/tools/syscall.tbl @@ -360,7 +360,7 @@ 343 common vmsplice sys_vmsplice 344 common move_pages sys_move_pages 345 common getcpu sys_getcpu -346 common epoll_pwait sys_epoll_pwait +346 common epoll_pwait sys_epoll_pwait sys_oabi_epoll_pwait 347 common kexec_load sys_kexec_load 348 common utimensat sys_utimensat_time32 349 common signalfd sys_signalfd