From patchwork Tue Aug 28 09:08:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Thierry X-Patchwork-Id: 10578075 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BABF4174C for ; Tue, 28 Aug 2018 09:13:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id ABB2D2862D for ; Tue, 28 Aug 2018 09:13:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9F32B28660; Tue, 28 Aug 2018 09:13:07 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 383042862D for ; Tue, 28 Aug 2018 09:13:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=CLY+vxlnw0ARlYkB2lSlstAMuVDIjeR2tSB2M2pGTYk=; b=i1upmRZNnD03GGzx6tslpyXU73 evyFmf5pNug2ZmNz52SZ82UaRnOnUZq5r3S/wB6YKn4gGnnGYk5ol7DwMj8XCi8Fn4UkUQjnbs3Kw B4FyZxpzBdAKVqQyWtS2GBkol7EjMgRVodZDXgDQp9pR9F1EDsL3y7NHlWJXxaMHFms4DOScR0wa2 0jUVnqeVUQSLk4DsXTJyPS1N/BVzDqYEGa271DdfiiH3BuyRdp9ATL87CWyOMesqHugQSft543EPW HPngkmMjeTJE/pFnFyT65GQyHPyy0UuLHlmtJ33aHd78LBEGWIx093yZOkmBI0kwCRrBtjMQekLvG Ikkm4brA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fua3Q-0003Q2-D8; Tue, 28 Aug 2018 09:12:52 +0000 Received: from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70] helo=foss.arm.com) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fuZzn-0000bo-Mt for linux-arm-kernel@lists.infradead.org; Tue, 28 Aug 2018 09:09:09 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 962B619BF; Tue, 28 Aug 2018 02:08:54 -0700 (PDT) Received: from e112298-lin.Emea.Arm.com (usa-sjc-imap-foss1.foss.arm.com [10.72.51.249]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 8827C3F738; Tue, 28 Aug 2018 02:08:53 -0700 (PDT) From: Julien Thierry To: linux-arm-kernel@lists.infradead.org, linux@armlinux.org.uk Subject: [RESEND PATCH 8/8] ARM: oabi-compat: copy oabi events using __copy_to_user() Date: Tue, 28 Aug 2018 10:08:36 +0100 Message-Id: <1535447316-32187-9-git-send-email-julien.thierry@arm.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1535447316-32187-1-git-send-email-julien.thierry@arm.com> References: <1535447316-32187-1-git-send-email-julien.thierry@arm.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180828_020907_858095_A0BA0D8D X-CRM114-Status: GOOD ( 12.00 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mark.rutland@arm.com, will.deacon@arm.com, Julien Thierry MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Copy all events to user using __copy_to_user() rather than copy members of each event individually with __put_user_error(). This has the benefit of disabling/enabling PAN once for the whole copy intead of once per write. Signed-off-by: Julien Thierry --- arch/arm/kernel/sys_oabi-compat.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/arch/arm/kernel/sys_oabi-compat.c b/arch/arm/kernel/sys_oabi-compat.c index f0dd4b6..c89d27e 100644 --- a/arch/arm/kernel/sys_oabi-compat.c +++ b/arch/arm/kernel/sys_oabi-compat.c @@ -278,7 +278,7 @@ asmlinkage long sys_oabi_epoll_wait(int epfd, { struct epoll_event *kbuf; mm_segment_t fs; - long ret, err, i; + long ret, err; if (maxevents <= 0 || maxevents > (INT_MAX/sizeof(*kbuf)) || @@ -294,11 +294,9 @@ asmlinkage long sys_oabi_epoll_wait(int epfd, ret = sys_epoll_wait(epfd, kbuf, maxevents, timeout); set_fs(fs); err = 0; - for (i = 0; i < ret; i++) { - __put_user_error(kbuf[i].events, &events->events, err); - __put_user_error(kbuf[i].data, &events->data, err); - events++; - } + if (ret > 0) + err = __copy_to_user(events, kbuf, ret * sizeof(*kbuf)); + kfree(kbuf); return err ? -EFAULT : ret; }