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 55CDFC43612 for ; Thu, 10 Jan 2019 17:51:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2ACBF2177B for ; Thu, 10 Jan 2019 17:51:57 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=linaro.org header.i=@linaro.org header.b="XoxxG6nI" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730596AbfAJRv4 (ORCPT ); Thu, 10 Jan 2019 12:51:56 -0500 Received: from mail-qt1-f196.google.com ([209.85.160.196]:37525 "EHLO mail-qt1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729480AbfAJRv4 (ORCPT ); Thu, 10 Jan 2019 12:51:56 -0500 Received: by mail-qt1-f196.google.com with SMTP id t33so14294587qtt.4 for ; Thu, 10 Jan 2019 09:51:56 -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=XoxxG6nIkXzy5QuWXVubom4W8yRZ7hlnyFU2dEJ92pcz6crO26BV8Qil9G6EPL9U4e 7Y/ZCCM8TaGb+Y3TtIL6+IyVcm2asy6mn/NuerX3p51yj9nq9ZDYDe5/5C394iRuUTsp 7yj6AaX96rcawCb3VL17v340YPLTVWRWLfocY= 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=kTTwvgdatRWupDiU3SEV/RqxMdqMzqqRyZ6IRB0HflMBbKGdt9grXbB3ZwS21tF0cR 4KRbF0Zdha5HJbgEAWoK+x7g9G/I2qqbhYeZQJe9yxBaS+Otrd4Yy1r8Qu8/bzr/aLLN prt5CN/D9mIZZBI61eFqh9khpKxB9VBWUgN5/ObsKiijlfVHZZ+3nTxxzQbeHdqVbSV2 rBTALDwnU6hEfGDlfPFhHBYHNhlpIeGk9sk1VZQDaRsjY3N2dx/KAs17QHwqOXyifKsA +ujJNrqtxPisbDrcvy5ysBjT0D3mAzdYHMj+d+g0OwajbLubSvhxujOgnlivxzsFS0NW 79Ow== X-Gm-Message-State: AJcUukdmE0IlcyziQWgRmJ7LnydSdhql3oDmjoLvt2krqusZUx/2Zrwt c0tpVwJsr6hPSP3CxSgMHgW74lWJ1E8= X-Google-Smtp-Source: ALg8bN5fm7v1MtKixcl+8vLZVkwxRNJ2XAMHpZiZzP9iGYAS9AYiBk3+DprARd+bOFR8AllabA0Yvg== X-Received: by 2002:a0c:bb82:: with SMTP id i2mr10600208qvg.159.1547142715346; Thu, 10 Jan 2019 09:51:55 -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.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 10 Jan 2019 09:51:54 -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 02/17] ARM: 8790/1: signal: always use __copy_to_user to save iwmmxt context Date: Thu, 10 Jan 2019 12:51:35 -0500 Message-Id: <20190110175150.5239-3-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 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