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 14124C4360F for ; Wed, 13 Feb 2019 21:34:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D68E120842 for ; Wed, 13 Feb 2019 21:34:01 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="INlw/sfd" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2394810AbfBMVcb (ORCPT ); Wed, 13 Feb 2019 16:32:31 -0500 Received: from mail-qt1-f193.google.com ([209.85.160.193]:36476 "EHLO mail-qt1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725838AbfBMVca (ORCPT ); Wed, 13 Feb 2019 16:32:30 -0500 Received: by mail-qt1-f193.google.com with SMTP id p25so4188880qtb.3 for ; Wed, 13 Feb 2019 13:32:29 -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=5XtoX2htZ0Jn0tkRDWU+S8lIEuB+MnkGDKzlpE3hBEI=; b=INlw/sfdBet8zDSCENoUwjfxegtQlubL9UmVGQ07agMByfU1HAD3H6h9a1h2loynnp zBn7NmrS7lFmiBMIz9STmkRLR4t0EGPGbcfCvbTVmPSrCy2PkE7Z0HkU7OwuAuiOjR3M TKMa7VyyFbih1CnDzcjCy6tjIIoJ0owEjYB5s10dv8Di/0rRLxE3y6e9eDMS55JtKNmH yub/0NtCqNx75NQSD4oRmEx8hWU7+SaDO+e5P9hWDV4q76VDLGbxTISVejAenTSkwwYl t5Z8E35rqVaX7ETno347GhxF/MP/k3KiU2j22qhp/IRz8CY7HuxQgbG1BQxSxnFE+Gng kcXA== 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=5XtoX2htZ0Jn0tkRDWU+S8lIEuB+MnkGDKzlpE3hBEI=; b=KGrU7X5S5/g71Y7InEcseYdCnfO7ncwJM+oymD4VkLZ1ehf6gDmJoj7XBv8v0mRRGf VbicJR2dFquwuUMhofTIqKQLOE104fGfqlKxkCBsjU3N15j7CdjkD6IKmMjzj9LoZsmu 6tJ7Kt3kCR8xDN0pnJ3DZa1V4Uk3l2q5fvlPhqQbHuiZG+2zqxkonAUwAZBY24P/z+jq BXyX/i4pInh4sIIV3Lm/Ggfb2G97xAgGwXxR3B+spnckV3q4plFtgf4ZxtlQtwlSdKGY kTBaKLODVIaup3b5z4q2yvUGodEsmQhCTAhSnyr+8b6cENpPns0wfjKnp6xym1xbBPt2 hyaw== X-Gm-Message-State: AHQUAuZRzIVAvv5jzxW+l0YdXznr/hOmHo4iUFkxgaqjlL2DBC2E9e0Y 6EM0J34k/eGnyBQ4HOms1Nw16/nECok= X-Google-Smtp-Source: AHgI3IaAByStjv6V8O35bZXVYKzOSf+ybqp0f4fOFSaCjYM8AkzPrVq89diPIrhoukHRBUh3IUknVw== X-Received: by 2002:ac8:17e7:: with SMTP id r36mr249071qtk.104.1550093548757; Wed, 13 Feb 2019 13:32:28 -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.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Feb 2019 13:32:28 -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 02/17] ARM: 8790/1: signal: always use __copy_to_user to save iwmmxt context Date: Wed, 13 Feb 2019 16:32:08 -0500 Message-Id: <20190213213223.916-3-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 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 76fe75d36312..464393d241e1 100644 --- a/arch/arm/kernel/signal.c +++ b/arch/arm/kernel/signal.c @@ -77,8 +77,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 @@ -86,10 +84,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