From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F39F8FA372C for ; Fri, 8 Nov 2019 12:37:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BD18F224D7 for ; Fri, 8 Nov 2019 12:37:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573216633; bh=gRdun5q5XOK+Ts7w8sB/Z1w+m9s6+mqnzWaFuQ24LAw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ovlrNFObhJ9NI0X6VB2d4Ey1X503uBJKEE1KGYNdwj5SFeEaFsWmZjIWGbHWa8wS8 AscnqXvM8/p+qp1ISyuw9GFeUDnQhxhhpom3OQPs2onfS/l5nGMtRfQGnyPCSg5sV+ odbxhAMHeDOQu9h1v2r54ueMh0McajRpe0FWvC+g= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727148AbfKHMhN (ORCPT ); Fri, 8 Nov 2019 07:37:13 -0500 Received: from mail.kernel.org ([198.145.29.99]:44838 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727044AbfKHMhN (ORCPT ); Fri, 8 Nov 2019 07:37:13 -0500 Received: from localhost.localdomain (lfbn-mar-1-550-151.w90-118.abo.wanadoo.fr [90.118.131.151]) (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 3BC9B224D3; Fri, 8 Nov 2019 12:37:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573216632; bh=gRdun5q5XOK+Ts7w8sB/Z1w+m9s6+mqnzWaFuQ24LAw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=C1SWn0yqi9KqVYmB4CLnD9S4zWIjAWPhbliDvLQUIKoR13VbU1yOLtn1AIqR0r/JU IYku5vkDBo8mMAYiV1fhkzJAzJU8E+VEXNb9rdShgOIvkZyTxBsKx/x7hZ1S9FI7/0 tswTl7LCkokZbAh/FyHt7fTu3r7m25RbApkwBe80= From: Ard Biesheuvel To: stable@vger.kernel.org Cc: linus.walleij@linaro.org, rmk+kernel@armlinux.org.uk, Julien Thierry , Ard Biesheuvel Subject: [PATCH for-stable-4.4 38/50] ARM: 8792/1: oabi-compat: copy oabi events using __copy_to_user() Date: Fri, 8 Nov 2019 13:35:42 +0100 Message-Id: <20191108123554.29004-39-ardb@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191108123554.29004-1-ardb@kernel.org> References: <20191108123554.29004-1-ardb@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Julien Thierry Commit 319508902600c2688e057750148487996396e9ca upstream. Copy events to user using __copy_to_user() rather than copy members of individually with __put_user_error(). This has the benefit of disabling/enabling PAN once per event intead of once per event member. Signed-off-by: Julien Thierry Signed-off-by: Russell King Signed-off-by: David A. Long Reviewed-by: Julien Thierry Signed-off-by: Sasha Levin Signed-off-by: Ard Biesheuvel --- arch/arm/kernel/sys_oabi-compat.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/arch/arm/kernel/sys_oabi-compat.c b/arch/arm/kernel/sys_oabi-compat.c index 640748e27035..d844c5c9364b 100644 --- a/arch/arm/kernel/sys_oabi-compat.c +++ b/arch/arm/kernel/sys_oabi-compat.c @@ -276,6 +276,7 @@ asmlinkage long sys_oabi_epoll_wait(int epfd, int maxevents, int timeout) { struct epoll_event *kbuf; + struct oabi_epoll_event e; mm_segment_t fs; long ret, err, i; @@ -294,8 +295,11 @@ asmlinkage long sys_oabi_epoll_wait(int epfd, 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); + e.events = kbuf[i].events; + e.data = kbuf[i].data; + err = __copy_to_user(events, &e, sizeof(e)); + if (err) + break; events++; } kfree(kbuf); -- 2.20.1