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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,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 0A6C4C5DF60 for ; Fri, 8 Nov 2019 12:37:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D48A322459 for ; Fri, 8 Nov 2019 12:37:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573216641; bh=97pYGULCAD/3xuYZMgC9g2UXEdK175xz0efDfkqBNXg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=PeCrzYoqw/i+jF8Yfg6WfpLA56JXWjgubHr5qM0H1ZhYxexVAJ1Y4Hp+JAhEIBkAD yhV6rOugi3O6yU6j/+e2IP65MPWfKGsycVtVKPKiIrNicXtuWPlbGLtkRLBP3lMbIw AuMQ9JiPqtH1Hw5gmWG8+Ul2vymRtNG/RP369KKQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727166AbfKHMhV (ORCPT ); Fri, 8 Nov 2019 07:37:21 -0500 Received: from mail.kernel.org ([198.145.29.99]:44976 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726372AbfKHMhV (ORCPT ); Fri, 8 Nov 2019 07:37:21 -0500 Received: from localhost.localdomain (lfbn-mar-1-550-151.w90-118.abo.wanadoo.fr [90.118.131.151]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 9D4642248C; Fri, 8 Nov 2019 12:37:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573216640; bh=97pYGULCAD/3xuYZMgC9g2UXEdK175xz0efDfkqBNXg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yA5fYwq6adlX7LBQ/xFHdQw4ljZoJhQUwKITIXGnkwb2980uiSENICiXsrcGuhVr7 K561Wibc9mk0gEVOjpPb5M0VlYngjGcCwJ1+HbwlpMMLyr+XchtoCpwplVfOdBPa4b 0X+mi1HoIWtTnxlS3oJ0XUqMQ/+OmX7ZLFnMNZXI= From: Ard Biesheuvel To: stable@vger.kernel.org Cc: linus.walleij@linaro.org, rmk+kernel@armlinux.org.uk, Julien Thierry , Ard Biesheuvel Subject: [PATCH for-stable-4.4 43/50] ARM: 8810/1: vfp: Fix wrong assignement to ufp_exc Date: Fri, 8 Nov 2019 13:35:47 +0100 Message-Id: <20191108123554.29004-44-ardb@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191108123554.29004-1-ardb@kernel.org> References: <20191108123554.29004-1-ardb@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Julien Thierry Signed-off-by: Sasha Levin Signed-off-by: Ard Biesheuvel --- 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 f07567eedd82..f9392fb060ea 100644 --- a/arch/arm/vfp/vfpmodule.c +++ b/arch/arm/vfp/vfpmodule.c @@ -583,7 +583,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.20.1