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=-9.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 6D2A8C4360F for ; Wed, 13 Feb 2019 21:34:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3DBCD222C9 for ; Wed, 13 Feb 2019 21:34:00 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="KL+czqKk" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2394819AbfBMVdy (ORCPT ); Wed, 13 Feb 2019 16:33:54 -0500 Received: from mail-qt1-f195.google.com ([209.85.160.195]:41021 "EHLO mail-qt1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2394811AbfBMVcd (ORCPT ); Wed, 13 Feb 2019 16:32:33 -0500 Received: by mail-qt1-f195.google.com with SMTP id v10so4454521qtp.8 for ; Wed, 13 Feb 2019 13:32:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=XKNS61az1WGOd8AWFZ4ZTIsUVQ0LSar+s/KyUDJcDZM=; b=KL+czqKkXMMB508fq669G8sT+oinM88F0RwPUXD47WYPeCn3WLKCVKUEffgwBJq773 Bg1l2Idlw4ewZ01aKj8lj1coFPtuAL3watPBEPI0V1YOSoDdePcdZB8Th3Fd3c0qQWUv 9PHttCq3XE4t+Wgv1+Od9KHuSsuezWVZO4EV+qtM7rzYx61k6AeU+ooiynssjwKJsgSE /dlmUOsLQF+2QCdYMAHoMSSlAEoiaEMG5c7qpJ6d4se4O0aALSlTRnnsKxhoSXQc2K// ilgZIL3sdIklo9RYYGOMyomibbU7A4nJ4qtH3wT1x9FoXpGyuxCFuDjugd7OXe3YmVEl u4ZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=XKNS61az1WGOd8AWFZ4ZTIsUVQ0LSar+s/KyUDJcDZM=; b=tS4u49IC625RntIoBvnC+pl5yNfI8jYMXSsXVz9xh2BwpCXoC1DR4jBTwaxWXzfXJW 7yydrEpg6ZX9NE0SkTc2wq9is+Bd4C9PzW6Zgc0CkZ7Zd0lsVW6W8j3YtRa8D5Tw4Ris Ve0oX8V6jTkhe+EHGv+kXT2wqOmDoFKXKhUFTmtPACKSIVg+u6YEqtt0Fl9SRs3EnwZb NzYjZlvrIvRlRAbcfulpFQADkHr9DmLSsPnNs4UZ70UqeRvR0ayhkbrCw3F0zWkqRwmd xeI2dKGnqSeL4DIDNn0ef/qqObAtQA7X/IQ7OkHsh6GmD1h87NOdC3Lrs8o+pS/tkOr+ jaFA== X-Gm-Message-State: AHQUAuZ/YeB5329Z1BOJTTiKuTgKqL5XDiisAvgytd95MfafgmQfSFOZ pm/fpRHDu1uPDnE8k4iw/dhwdjpr6nw= X-Google-Smtp-Source: AHgI3IafCpIs/y9rPR16co2x66QKSVzJyNLtvmMs6gDQZEW/2cbXdskUKQ+2kKteni/lPrG/s6kmDg== X-Received: by 2002:aed:2044:: with SMTP id 62mr224159qta.11.1550093551451; Wed, 13 Feb 2019 13:32:31 -0800 (PST) Received: from localhost.localdomain (pool-72-71-243-63.cncdnh.fast00.myfairpoint.net. [72.71.243.63]) by smtp.googlemail.com with ESMTPSA id 8sm382675qtr.7.2019.02.13.13.32.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Feb 2019 13:32:30 -0800 (PST) From: David Long To: stable@vger.kernel.org, Russell King - ARM Linux , Florian Fainelli , Julien Thierry , Tony Lindgren , Marc Zyngier , Greg KH , Mark Rutland Cc: Will Deacon , Mark Brown , linux-kernel@vger.kernel.org Subject: [PATCH 4.19 04/17] ARM: 8792/1: oabi-compat: copy oabi events using __copy_to_user() Date: Wed, 13 Feb 2019 16:32:10 -0500 Message-Id: <20190213213223.916-5-dave.long@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190213213223.916-1-dave.long@linaro.org> References: <20190213213223.916-1-dave.long@linaro.org> 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 --- 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 f0dd4b6ebb63..40da0872170f 100644 --- a/arch/arm/kernel/sys_oabi-compat.c +++ b/arch/arm/kernel/sys_oabi-compat.c @@ -277,6 +277,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; @@ -295,8 +296,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.17.1