From patchwork Fri Oct 30 15:45:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 320001 Delivered-To: patch@linaro.org Received: by 2002:a92:7b12:0:0:0:0:0 with SMTP id w18csp1521303ilc; Fri, 30 Oct 2020 08:45:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw+wZ9jlsa8I7H033uR8bKCTkFtTUfj+SX6z1vQQDhvMTya6Jwol7i+EqYSSBbDggrQVhvE X-Received: by 2002:a05:6402:10c7:: with SMTP id p7mr3099870edu.34.1604072755760; Fri, 30 Oct 2020 08:45:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1604072755; cv=none; d=google.com; s=arc-20160816; b=ClDRqJoyir7MdYQHn893gqra7j9Q7XlERa87WKcuG+6TOucK4IVcJIdyuuQlw/C4d/ 900WFra7Eh6fZrz6PnVPmETyOWWNa90iv48yyFtpDqKhAyA4/73RJLcpnhrRNW5EzWfS 97emuwlmBtRC/voa9B+As2VtkLScpxDWwFNU8xskA71U8KtAzTDVKI8SsUfxWt4RG88O Y4P02+sSzTRF+ofv2UsIVt1L/PGq0ykn01OQyMxqYHAoT6/hAnL8eDp6peNVHTm1Jwhq TkN2x+0FfDutDqZQSdq+NmdceShwaBjMZs19xubc1jjymtdLcLVoeP9H4MFdxZoGR4Bc nylA== 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=Sbfm57XDzq4N1uQNIukJsZdh4dZj2xD5w35PVOdzi1c=; b=LULCe77ptJi9Z1s9wR9rfchakrhit20cpfyMhIrRuZ6obpxFx+7C7wclqrXdIwho/E GucKTDnUlcaZmclH25ec779JbxI4kfIfjdRtGJ3VM/NccjfaedtXetvEdatWBkU5sn0h l5i+TdBFDWP98/toD/sf3wOTmt4xJc0BCFHkcmT1A2RezxTanqhkOJ/5Tf8PIll2wmoq 8X6IX63ZCjt1iwGB5rZumjYAoPiUdlF3mpCM7ecAtx9vSWgMHRfokD22FqmridgWM4Jl cYVuIru4BGbGIMzMX2GrNlv4SMeNtRCeirI3+fEJ7OfLOnALkFxQk+jyzEg9t7lP2ksy 7ywg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=tuB2UH3u; 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 h20si859725edw.304.2020.10.30.08.45.55; Fri, 30 Oct 2020 08:45:55 -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=default header.b=tuB2UH3u; 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 S1726703AbgJ3Ppz (ORCPT + 15 others); Fri, 30 Oct 2020 11:45:55 -0400 Received: from mail.kernel.org ([198.145.29.99]:40892 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726674AbgJ3Ppx (ORCPT ); Fri, 30 Oct 2020 11:45:53 -0400 Received: from localhost.localdomain (HSI-KBW-46-223-126-90.hsi.kabel-badenwuerttemberg.de [46.223.126.90]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 7B90A221EB; Fri, 30 Oct 2020 15:45:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604072752; bh=V6qzY14LfJ5Qyf+Zp/oXQxezqCq4VbzoDYPwNxOKOhw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tuB2UH3uNYtQyxJSjWb0uv+4ikINrjEAMJGcKVb+8yprI9NCvDYnrKA25a3q8yBwg UmjLFqZ0f97RsPoNsMbuybZjbt2XSsnx8tN5/c76uIexhIez3jdFURPMZxrwIDK7uf DK20C5JJj5i59pP3SvGVFzQpFcf94z1id5j2K5AY= From: Arnd Bergmann To: Russell King , Christoph Hellwig Cc: Arnd Bergmann , stable@vger.kernel.org Subject: [PATCH 3/9] ARM: oabi-compat: add epoll_pwait handler Date: Fri, 30 Oct 2020 16:45:13 +0100 Message-Id: <20201030154519.1245983-4-arnd@kernel.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201030154519.1245983-1-arnd@kernel.org> References: <20201030154519.1245983-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 | 37 ++++++++++++++++++++++++++++--- arch/arm/tools/syscall.tbl | 2 +- 2 files changed, 35 insertions(+), 4 deletions(-) -- 2.27.0 diff --git a/arch/arm/kernel/sys_oabi-compat.c b/arch/arm/kernel/sys_oabi-compat.c index 0203e545bbc8..a2b1ae01e5bf 100644 --- a/arch/arm/kernel/sys_oabi-compat.c +++ b/arch/arm/kernel/sys_oabi-compat.c @@ -264,9 +264,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; @@ -299,6 +298,38 @@ asmlinkage long sys_oabi_epoll_wait(int epfd, return err ? -EFAULT : ret; } +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; +} + 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 d056a548358e..330cf0aa04c4 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