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=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 6BF2CC43444 for ; Thu, 10 Jan 2019 17:52:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 43976208E3 for ; Thu, 10 Jan 2019 17:52:00 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=linaro.org header.i=@linaro.org header.b="Ie1a5r/O" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730692AbfAJRv7 (ORCPT ); Thu, 10 Jan 2019 12:51:59 -0500 Received: from mail-qt1-f194.google.com ([209.85.160.194]:37539 "EHLO mail-qt1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729480AbfAJRv7 (ORCPT ); Thu, 10 Jan 2019 12:51:59 -0500 Received: by mail-qt1-f194.google.com with SMTP id t33so14294886qtt.4 for ; Thu, 10 Jan 2019 09:51:58 -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=ao2zNPPAVKm6DVngcSIODmeIuZt8Da7c4FKcqwlcUWs=; b=Ie1a5r/O0ICRueF8TfCawjsPDMX2IlNYdg8hq5n3FB38u1hmc3s/00N6umkySrF1jF GuFoTESfgJumiymAkU5WqXQRJ5ZlfXIMcYkb2W+KNr+kixWaMsLMcjcZjDinjAnVfTYF CI4EBt5nfCTpzwE67luXQuJmOESssk839uop0= 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=ao2zNPPAVKm6DVngcSIODmeIuZt8Da7c4FKcqwlcUWs=; b=TG5cKT5kTaasY/jvzzMBZDkZ44h+mrMpeVxBQ3ajmcnyPH0BUYA2yqhaXiOIcifvmi seeZvSSiez7h8nJ74P8z6uZYFz9m24T6l20yzkkRHtYcV0PkuMlTGo7Q8f9kEhkmqjo2 nfAL3FjacRSsdgH6Gh7T+Llly/vJan0O5DAOX4kuI9wqEuL11w9WBWxrVJj60TtUjkZL K6m5kmo5qQwW58v/OirRMtH0WARGe0OeMvZ7Vev3D5FPbvKe/no2UjZXW35prm1ZdAb9 Nw28SaWUDZ7C9Zey9u1qN3w2pT9ZzOvX9uyruUz5NzF7PJ/Z0kZbG3OrlWKusRJSfXgC vctg== X-Gm-Message-State: AJcUukcq1XGuOPuu+EEqhb2a80VVBM8h0HlrEKP0jZKfzAAOHb2kkPV3 xdQsWIHQI9LLAyCCMaqJ7FUWpnxf5fw= X-Google-Smtp-Source: ALg8bN4Vk8foP957aG89chLyi3lmG4EYGCpBn5F4aH2fNirX+txN+w0PXN/zchdWyEdwDRBbbG/ecg== X-Received: by 2002:aed:2151:: with SMTP id 75mr10935832qtc.24.1547142718219; Thu, 10 Jan 2019 09:51:58 -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 b8sm41815904qka.79.2019.01.10.09.51.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 10 Jan 2019 09:51:57 -0800 (PST) From: David Long To: stable@vger.kernel.org, Russell King - ARM Linux , Florian Fainelli , Julien Thierry , Tony Lindgren , Marc Zyngier , Mark Rutland Cc: Greg KH , Mark Brown Subject: [PATCH 4.14 04/17] ARM: 8792/1: oabi-compat: copy oabi events using __copy_to_user() Date: Thu, 10 Jan 2019 12:51:37 -0500 Message-Id: <20190110175150.5239-5-dave.long@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190110175150.5239-1-dave.long@linaro.org> References: <20190110175150.5239-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 4abe4909417f..a87684532327 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