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 45012C4360F for ; Thu, 14 Feb 2019 02:11:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0E09C222A4 for ; Thu, 14 Feb 2019 02:11:58 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="UgLNxFkX" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2393908AbfBNCKc (ORCPT ); Wed, 13 Feb 2019 21:10:32 -0500 Received: from mail-qt1-f196.google.com ([209.85.160.196]:46991 "EHLO mail-qt1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2393897AbfBNCKb (ORCPT ); Wed, 13 Feb 2019 21:10:31 -0500 Received: by mail-qt1-f196.google.com with SMTP id y20so5128817qtm.13 for ; Wed, 13 Feb 2019 18:10:31 -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=UgLNxFkXN5F63atBRrO/+dam22AD9xcXt581af1qQdlsAytsMpzMy2XlygaxbDcy9/ IdR0Gl78bheX/LuIAHEvlKI4oUOuU+pKQ5vBGreBFVzSfcJK+pexDAHvgXYuJW6qEPBl MIfREGA1UDearL0vzEYwwS5sS6+qjjF/6wb3Gcbym8V1KeqLvP4ipKSLe9McwMp3CSNH UpqVvpyjWo1zfaHelNPDMWd0FCLwZQe6PSRRiNJ9ddj4VafKY8itk0YlzY/dUVil6rO6 VMMOZPJ9urwPQ3QFJCgCy+asEJADrs9qRwaTlQN7U0ZCrG5bwTg2m/ixn299DpCyB0bU wGjA== 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=NErfBWpqW2RMSfG06J6PxNwGCgU26T6VfaG7bCDE9G8R7uagRL0TSh0uDUcDNxFPtB JlG1FUw6WSI23FVv5BWn6x/kYRXZ11KI1sSjnrvlynd8g1MlD9vj4W6TgSB6fnPYMkX4 SQ2zslWTUcz1nbIn8kw8vKejcbFzodXsy6vP2lrqhHib+jBQPbOWR1GT/a/yz7yxVM30 PR1fSig/cpEmhMtiwJ0gNjLFjLMEppmaJfQYk+AI7SwCJ9ruFcGkjc9WsvKO9Yak2NYQ 4QDW0agxzPtjisdggi4wPSIlWZxx4tGoDLJPbX7Jidzdgx28KN5UkoXpxUtcmTA70PId 5Fjg== X-Gm-Message-State: AHQUAuYBp/yhxoYMxXsq+6YQFM6ORF9kPlBNQSNY5J2CHjUwO5aWVGBP m/n+kcJSXelnE9ij7lRUTW456lzmRe8= X-Google-Smtp-Source: AHgI3Ib063IR4oXphlNEnw5EUM6dccVs/KVPVRN+fklLvH0axGg1PfPynsFO4dxwzyS+e/OVR7NFCw== X-Received: by 2002:ac8:2c51:: with SMTP id e17mr1032432qta.254.1550110230310; Wed, 13 Feb 2019 18:10:30 -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 d63sm1091575qka.22.2019.02.13.18.10.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Feb 2019 18:10:29 -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.14 V2 04/17] ARM: 8792/1: oabi-compat: copy oabi events using __copy_to_user() Date: Wed, 13 Feb 2019 21:10:09 -0500 Message-Id: <20190214021022.5313-5-dave.long@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190214021022.5313-1-dave.long@linaro.org> References: <20190214021022.5313-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