From patchwork Thu Aug 1 08:16:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 170343 Delivered-To: patch@linaro.org Received: by 2002:a92:512:0:0:0:0:0 with SMTP id q18csp5086842ile; Thu, 1 Aug 2019 01:21:15 -0700 (PDT) X-Google-Smtp-Source: APXvYqxc4rKoUcalIEo8ti5Oxtbpe1+ugYSsmskm6oc8jFycVdUauKmmpjiy/y/fH5w3KiuOmChS X-Received: by 2002:a65:4507:: with SMTP id n7mr10079089pgq.86.1564647675590; Thu, 01 Aug 2019 01:21:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564647675; cv=none; d=google.com; s=arc-20160816; b=FlvjN/Eb/s/cOR+FMpEdEr8hbE0cXSA1qXIs9L6XqRwFKJTaRjcrfSgWBEGQuqS+uM T5XyCAg9rqsQW5LmatnmtrgJy2f7/IOcjD0aCbMN26VHUeok8yr+1PI2/G3blKo6cDk0 gzRLYR1j6jReeP5zDe0Gtv0p01t/+FQT+fnbvzodaiiFlXa++/YDZh0Q3zroigoHfxge 4m430xroQJY/Oq+EdkWNXDf8/FZkQ435CDoDQki1snu/2NL/GB7Qx3J6WSIM0bQrO7TC pWXDbm5UPLiy0hORVbCu4BHpT8EfEl0FEklAVbMLz5q+bd6OOzBMB5iGaOm/g/zay56N 1g6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=/rNw3tnBxgbMcdBdzBneQcQUsRPBm5GaeGzxs7tkgFw=; b=w7VLwf4p3YhdQV0e3czP+9W1GtbK2/wzpM0Jz1nsl1fR46hbLnfL2ED9o1qfHjAKlq 0dUE8SCSVM7Pp/o1mWIYIDkc45V+PCVeU42iuRfp7aD0PYS+KTuOOBsXASxVliHbipkR yDXqg+1DA1IqKhkMNp+iOmNxWrXMGjoFVXGa4tQ+zj8iC7b6Q3EzPcNsIHyVQ+Tl+v4D p49Z1vrA5SEigfPmEBex9tsOF6d5Nrl6Qa1b0BRT7og4WCE9DklpjQwv/6EHJJiJA8oC /WhM0IQRfk/yCB+cs2x51jBtVazeJYqkUE8nXTakLHZF6cs4PkFmgZHdxW4pvVX8622x XS0g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=oN+aQ42T; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z13si4013236pgj.476.2019.08.01.01.21.15; Thu, 01 Aug 2019 01:21:15 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=oN+aQ42T; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730700AbfHAIVO (ORCPT + 14 others); Thu, 1 Aug 2019 04:21:14 -0400 Received: from mail-pg1-f196.google.com ([209.85.215.196]:34434 "EHLO mail-pg1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731106AbfHAIVO (ORCPT ); Thu, 1 Aug 2019 04:21:14 -0400 Received: by mail-pg1-f196.google.com with SMTP id n9so27510306pgc.1 for ; Thu, 01 Aug 2019 01:21:14 -0700 (PDT) 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 :mime-version:content-transfer-encoding; bh=/rNw3tnBxgbMcdBdzBneQcQUsRPBm5GaeGzxs7tkgFw=; b=oN+aQ42TkqS/ZeSiy3PDVQMFYJwaMygZDYjh2qN8hDnDvIcJXJV2xpqOJsfr2J87Vb HeXPSEp5GcxRtJuCXOKlcDE0H84nRUB/twMJAH4jd/ZRQ2XVQgi3URaW62kWUFpPqhvx VWkcO50KK0MHGygwXTdMFgPeTJlYbSSFLDzu1sgoU/zfeXdgQg51br4OgEkEcdJH7Lzk 5i4gx5frWTr2aRqQyJrFvT/4HICocdqzcTYe2qbKmjtEUEJkGpNm+nulY/vpSEPHBKFq F6bqs230Y4TzLP/JVePgx7etwDRWQKZEMwVpsDX3zL1VhLFRyfY4sqoDKQ1VqFNTrw1w JK+g== 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:mime-version:content-transfer-encoding; bh=/rNw3tnBxgbMcdBdzBneQcQUsRPBm5GaeGzxs7tkgFw=; b=ulaalJX5sD1HK86DM5Mgohu6ad/EcVCNBOLzIMHqH3bMC7Ei45pfbHcvDU7puRtMM4 CN8orfy1MOFs187RUC28/FM+b0JT3Z8dz/mIU6NypiPPHe2Gh4Rq2gUIM7RTml5hsgzE jf4jfe1gDdFow5DfvEjWz8x9EBM8Nl6e0joYpU72ubAibYYJFGQwgT5ycAj413CSykpr 9dVi0T7KB48fl+ZCJP9XAyOXmkCpb12+/U4fi104+vLCaji42qJchqB/96lzxoBnZ7Xd 2xuVy5or4m3UN1ao95BLs4InaOJdBAnUT7WpshYgBv2UIqAwS6x9D5NjvRk5sYJ+29mM a9VA== X-Gm-Message-State: APjAAAV5Ymsh2AhMSf8G4zjcZhQiQEojMKZTZZV+hOS4n468xWT088KW EvC2WAH9/TBgKjjjBBwKHVbKbejtsb0= X-Received: by 2002:a63:c006:: with SMTP id h6mr83873722pgg.290.1564647673509; Thu, 01 Aug 2019 01:21:13 -0700 (PDT) Received: from localhost ([122.172.28.117]) by smtp.gmail.com with ESMTPSA id f7sm69426237pfd.43.2019.08.01.01.21.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 01 Aug 2019 01:21:13 -0700 (PDT) From: Viresh Kumar To: stable@vger.kernel.org Cc: Viresh Kumar , Julien Thierry , linux-arm-kernel@lists.infradead.org, Catalin Marinas , Marc Zyngier , Mark Rutland , Will Deacon , Russell King , Vincent Guittot , mark.brown@arm.com, guohanjun@huawei.com Subject: [PATCH ARM32 v4.4 V2 38/47] ARM: 8810/1: vfp: Fix wrong assignement to ufp_exc Date: Thu, 1 Aug 2019 13:46:22 +0530 Message-Id: <17ef1620483a77f70c7c27e64cba3ad1684626c7.1564646727.git.viresh.kumar@linaro.org> X-Mailer: git-send-email 2.21.0.rc0.269.g1a574e7a288b In-Reply-To: References: MIME-Version: 1.0 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: Viresh Kumar --- arch/arm/vfp/vfpmodule.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.21.0.rc0.269.g1a574e7a288b 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);