From patchwork Thu Jan 10 17:51:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Long X-Patchwork-Id: 155254 Delivered-To: patches@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp2176255jaa; Thu, 10 Jan 2019 09:52:08 -0800 (PST) X-Received: by 2002:a37:80c2:: with SMTP id b185mr10034250qkd.8.1547142728098; Thu, 10 Jan 2019 09:52:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547142728; cv=none; d=google.com; s=arc-20160816; b=DFOr6U6OZim38RHICmFlOopZT0k1AIGpFnUVJkeBdJbn+X6zKuvsR8XgZzIZnKVPh1 72aGwUpDTirdL3FrdCQAnq8xWqD5FBVnwoy9RWgSnWh6V1JzXNw58FxhvC93Ay5t6/3Y zXDfDmDYHy+NUY9mFp8snLhrSgh4KZearUE61MUrtv3xER4aEQnqAlsjcsdms0IxfX4e d8t+dMcgw5EK/Ez4QOjnkB+Txr12N5kW32D8AygPgOxKb8mRkbXzkH6CZiN2Q2MfNIRo VIDS5jTKIhtKJNJzal8KBqrxHN/7sj4zRRMDlGS4d+DRGs+61ZFk+j2LqFRv86+dwOeP cMvg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=WeFsULKehq8jGUkRqP49XwEy/ibmR7uFLb5YfBUBkPg=; b=ldck7bYlsBpl8glE+HLscowqMryihp0qJP4SUooQj+nBMbcJaBpBl+ieD/Mup6yx7v l2OjLCBLeKQT4YL9YzJMbXYIUcm42OUySlu6RwoszhHLv35WFh7ldztKkifNdAJJXW2P fRDStXQCtIOQY3e3lZIemQvY6r60CzSnO4rCw/QcJnk3dJn1UWr/rIm0a8J89Web7t6X yYo01b+RmZbhJsaY7oL9PWwZ84Bhwy9nhTIKdzouthIexKjY12/1YBGiAdb8eGmtKrgx 45UW+flh+GOjFB3aAWjbCPKfRK4avdIgusUzi8vmjJu15UqO4MiWX4PVnMul5Jc27czJ gWcg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Q6w+70Qn; spf=pass (google.com: domain of dave.long@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=dave.long@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id 8sor71710514qto.36.2019.01.10.09.52.08 for (Google Transport Security); Thu, 10 Jan 2019 09:52:08 -0800 (PST) Received-SPF: pass (google.com: domain of dave.long@linaro.org designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Q6w+70Qn; spf=pass (google.com: domain of dave.long@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=dave.long@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org 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=qNPibVkbUYzFEuUbOXTA5bnEOvy3f5mRK1EY1B3E2CCpLnQZzzbmusLlorTe9InjEu lMPGBgyydlffUheu4QdaecMd63fPrYU4Jg2iPbP2OcoZgVDlcPTiJ0ApYQS1W8QvncP9 N3Iee9WJM6knfcLd8+pGEIBK1RInbYWR/wh3iLulJJaBOL4DPnLDcMMnGUe2bLGpf7IF yc2nzsiNrnOl1Ai+lnYAkhoPPfAKu+T15iCdVdad1+qeiau5w4NS0aDgUFqWSi7i5J4r uiBhtTaYOS5KPoWV67MUanm6cM/DnSbtx50r6dF+tYKmggmkQ9iJblsOP/QJbdU/mtbd TBGQ== X-Gm-Message-State: AJcUukeOp3LEcJkBIdFcNdKO5W7yFsvwU6eXZ4b3OzKH8HuCCzWucV53 dSeh2tEPFyo4xEi6Gt0idfuN2KWN 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) Return-Path: 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> 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(-) -- 2.17.1 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);