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 B1EBAC43387 for ; Thu, 10 Jan 2019 17:52:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 87E8520685 for ; Thu, 10 Jan 2019 17:52:13 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=linaro.org header.i=@linaro.org header.b="Q6w+70Qn" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730549AbfAJRwM (ORCPT ); Thu, 10 Jan 2019 12:52:12 -0500 Received: from mail-qt1-f193.google.com ([209.85.160.193]:43257 "EHLO mail-qt1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730696AbfAJRwJ (ORCPT ); Thu, 10 Jan 2019 12:52:09 -0500 Received: by mail-qt1-f193.google.com with SMTP id i7so14275500qtj.10 for ; Thu, 10 Jan 2019 09:52:08 -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=WeFsULKehq8jGUkRqP49XwEy/ibmR7uFLb5YfBUBkPg=; b=Q6w+70Qnw+iwVXLPK0BUq2DNA5qVOdJeRLFa6hOZ70GT7vX5+CP41y9/EnC93QwF84 Bn8aaVEJooN+bmoleSFrb9cdsn0aG53YkwyBL7H5j8u6fNZPYddvQgoLGUJDZHXTAz45 eSVoSbvYTrLPFFJ/HyVaaPYGusrcsyGLdVPtI= 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=WeFsULKehq8jGUkRqP49XwEy/ibmR7uFLb5YfBUBkPg=; b=Ayr0Kih5xZp2AQNAHmmxEzrw/CEaik+MkpsF+IIiw6SbRSDVzcMcAjAzjagwPIZ+tv 4eKJCDSilgjJULGAL/TJHrFyROqS6R11/gOP2cmE73zwd141qe4UGNP6SOGxi3PS6r9p MSRewMYxfnYdzxCiNu5el5LhGFM9fr7n7Wht5XYllBr4VSDodsyeZEtG5xNuS9jvP9QJ nO0lftr4KVyb0WKEjj+zwsZoWVMEgNThCpz7ottxRxIZxGXGZCC7OLXPjf12hqBGiyIE albQhBQTlKCPz9JgPPIX9Z2b382OjS1jPU8u8RMC36rqFQVR9OeX+y6OgmVJp0QEK6yk FcAw== X-Gm-Message-State: AJcUukfyKY13dWgtupuTekKWmIdQgS+pRKkmLGF1E9Zhu9Gi827iiEvz /97uO7sb0PrDsnp1DZCz5wYXG6E9yD0= X-Google-Smtp-Source: ALg8bN6Ia2YWB8vTdBtnURUwxhv53c7saZdrz9kpftobSMKmpGJMt5iLwzeGEJVGRf6eh1qO9Y8jAQ== X-Received: by 2002:ac8:6a06:: with SMTP id t6mr10579112qtr.330.1547142727836; Thu, 10 Jan 2019 09:52:07 -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.52.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 10 Jan 2019 09:52:06 -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 10/17] ARM: 8810/1: vfp: Fix wrong assignement to ufp_exc Date: Thu, 10 Jan 2019 12:51:43 -0500 Message-Id: <20190110175150.5239-11-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 5df7a99bdd0de4a0480320264c44c04543c29d5a upstream. In vfp_preserve_user_clear_hwstate, ufp_exc->fpinst2 gets assigned to itself. It should actually be hwstate->fpinst2 that gets assigned to the ufp_exc field. Fixes commit 3aa2df6ec2ca6bc143a65351cca4266d03a8bc41 ("ARM: 8791/1: vfp: use __copy_to_user() when saving VFP state"). Reported-by: David Binderman Signed-off-by: Julien Thierry Signed-off-by: Russell King Signed-off-by: David A. Long --- arch/arm/vfp/vfpmodule.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/vfp/vfpmodule.c b/arch/arm/vfp/vfpmodule.c index 6bacd69c9e81..8e11223d32a1 100644 --- a/arch/arm/vfp/vfpmodule.c +++ b/arch/arm/vfp/vfpmodule.c @@ -579,7 +579,7 @@ int vfp_preserve_user_clear_hwstate(struct user_vfp *ufp, */ ufp_exc->fpexc = hwstate->fpexc; ufp_exc->fpinst = hwstate->fpinst; - ufp_exc->fpinst2 = ufp_exc->fpinst2; + ufp_exc->fpinst2 = hwstate->fpinst2; /* Ensure that VFP is disabled. */ vfp_flush_hwstate(thread); -- 2.17.1