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=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 2D2A6C43381 for ; Thu, 14 Feb 2019 02:10:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id ED567222CF for ; Thu, 14 Feb 2019 02:10:31 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="Zqofi2n+" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2393892AbfBNCKa (ORCPT ); Wed, 13 Feb 2019 21:10:30 -0500 Received: from mail-qt1-f193.google.com ([209.85.160.193]:45944 "EHLO mail-qt1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2393882AbfBNCK3 (ORCPT ); Wed, 13 Feb 2019 21:10:29 -0500 Received: by mail-qt1-f193.google.com with SMTP id e5so5140307qtr.12 for ; Wed, 13 Feb 2019 18:10:28 -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=AZaysvDZX4O/Bu8vrQvGUNcMZ0ecXD4hClmIQ5jet3M=; b=Zqofi2n+I6J25lcFxoU+utTxRN1+3tt6/q5AcD0yTqerFBelxOHNXClBDeDPFWesXN z1ejzTUM6KvhBdEgQBM/Y3HXY1BUgvNsqVlKmBYZaOS1N+ZbgNRFMatZ0Ah3lbQsQOul Mjo3+wBFgSwGNAzieoKIBXFrTDhNLwQ8Qd0v5L5mWi8mciy4JSUx1i0QDn5FGnJCc2nk vNv4Rr6Wf2InTUsczrWWDYcsBGTfyv2ZqxNm17xA4oJkeDx+8MQI4fkDafmDpQFCJU36 acaaGvZWly6x4cTB+4+Ro7DusNFpyg1CTEU/MIfvOUcLlMEoUOM3QXn5GCTlQlGfvQkb egVQ== 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=AZaysvDZX4O/Bu8vrQvGUNcMZ0ecXD4hClmIQ5jet3M=; b=s3XqjpJASgtjLI5tKUKxUwPpPwyEo6iLbLHEfSnJhLZfuc955NNp+IrwhFL4vX9NxE dqjHaBegvGdgtMYWKSGbB5R9HPxvcI6k2dIOs0VrVvMuVBI0u4Cjgl1XzqpZM7uOHWcW EmnIN8EHqKFb0pA2h/ejELypd28MDBCDYozaAT3XRg2ghus86HsUfgOnEtJXAs7B5+pa gzY6b6/bB0DdUW63hUVteaU7090jcJfionOlRadoy+qeAQ2YeK32TpUR613ItXAiPP5w aY5oToNceLNB+bpxgyH3YSvlaDFAC5O8RPzGN/BlJ197kHTR0GqS4MhNnpFjukC7Xi6z KIZA== X-Gm-Message-State: AHQUAuay6ftg3cfOov9sP17ohSC+02I9UUriMll4w6eXzsP3vVYfJxF3 1zHTlmv3ekZjOtnJU7YQ7wFSgnoFnfc= X-Google-Smtp-Source: AHgI3IZiSsetuliD1FYf/uzQZwhkfFxbABKBD2LRuA0i/09q02mdj1Hkf3uWB6pr8CJikGqsfr6JJg== X-Received: by 2002:aed:3ef7:: with SMTP id o52mr1079347qtf.276.1550110227507; Wed, 13 Feb 2019 18:10:27 -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.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Feb 2019 18:10:26 -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 02/17] ARM: 8790/1: signal: always use __copy_to_user to save iwmmxt context Date: Wed, 13 Feb 2019 21:10:07 -0500 Message-Id: <20190214021022.5313-3-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 73839798af7ebc6c8d0c9271ebbbc148700e521f upstream. When setting a dummy iwmmxt context, create a local instance and use __copy_to_user both cases whether iwmmxt is being used or not. This has the benefit of disabling/enabling PAN once for the whole copy intead of once per write. Signed-off-by: Julien Thierry Signed-off-by: Russell King Signed-off-by: David A. Long --- arch/arm/kernel/signal.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/arch/arm/kernel/signal.c b/arch/arm/kernel/signal.c index 1dc1f39825b6..b12499cc3582 100644 --- a/arch/arm/kernel/signal.c +++ b/arch/arm/kernel/signal.c @@ -76,8 +76,6 @@ static int preserve_iwmmxt_context(struct iwmmxt_sigframe __user *frame) kframe->magic = IWMMXT_MAGIC; kframe->size = IWMMXT_STORAGE_SIZE; iwmmxt_task_copy(current_thread_info(), &kframe->storage); - - err = __copy_to_user(frame, kframe, sizeof(*frame)); } else { /* * For bug-compatibility with older kernels, some space @@ -85,10 +83,14 @@ static int preserve_iwmmxt_context(struct iwmmxt_sigframe __user *frame) * Set the magic and size appropriately so that properly * written userspace can skip it reliably: */ - __put_user_error(DUMMY_MAGIC, &frame->magic, err); - __put_user_error(IWMMXT_STORAGE_SIZE, &frame->size, err); + *kframe = (struct iwmmxt_sigframe) { + .magic = DUMMY_MAGIC, + .size = IWMMXT_STORAGE_SIZE, + }; } + err = __copy_to_user(frame, kframe, sizeof(*kframe)); + return err; } -- 2.17.1