Received: by 2002:a17:90a:1609:0:0:0:0 with SMTP id n9csp846357pja; Wed, 1 Apr 2020 09:45:16 -0700 (PDT) X-Google-Smtp-Source: ADFU+vuEpbY6cWtUFzYvCKB+xJ0Yj6Gdo9G2lPDck9ZwY6BK4OYSGGtnKnjXrnjIojJ3kN9aVtnl X-Received: by 2002:a9d:748e:: with SMTP id t14mr16131973otk.334.1585759516113; Wed, 01 Apr 2020 09:45:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585759516; cv=none; d=google.com; s=arc-20160816; b=GSX511ATVfNv1k1zhLBA07f+VmJFXy8sGJAyVq58LSCnjG9NOj5HFz/kPGwPyYZKEZ rV6kt4D92dXo+SAxCt2Yde1SitKaaxFhWHSs062qkPgv0ZRqyvVvYA4s70O7MRZvRESE qGMTzlL1X1kZR3BED6cFNecKW+q51v0QxWZSGQVsDO5/JKcHdTnF8yQSMDW5BTx7+M7Q wsqYb6dqpXOJMpXzdMcZ86zMO3EyGhztqIo0Zk/sF5ZmFpgCDfQjFI86XezSRo6Ct5Rl ycsgk0qEByt2O24t31x5EmtzyewEane/AZoTAPBWu7RZai6EUN3POGefn1BMT/vYrxXy PTLA== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=/lINa55hPGILF5d9yJm3kNHCZZRoWPjpnq+3r3jAUGs=; b=eceHs7mzmCC82entycktGKcydFeg/qkGPFdWE3SkM7AfqsuiVBa9tIUOb3dkVXN+op q6p6v5tStohU+qjEnZ/N7IvLI9DyA4oOqOpyHnug+3qUXgj/YMQqMKLwr1iCUiEy3Jt1 bwnBCqd0K8jS4u6H4JiYbMuhb7OklEmrKTi+IcKz9Fq/RygOdWpyXY0aunoS8ujcEnKQ 0CdqgpV+2lTykXF+Q4E/+DNPReVHM1ChBXJKV6jIx1YQr5jtOmiLYyNAyUEPb96B3BVq kTticraqUV0JV4a05erD5EgQucvCjbTxBgfmSaYSWwLshYYR2P0RWjYF9L1VxNmDC9H+ 7dpg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=GMJZCm1P; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f21si1094905otf.31.2020.04.01.09.45.03; Wed, 01 Apr 2020 09:45:16 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-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=@kernel.org header.s=default header.b=GMJZCm1P; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389692AbgDAQoQ (ORCPT + 99 others); Wed, 1 Apr 2020 12:44:16 -0400 Received: from mail.kernel.org ([198.145.29.99]:45198 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389546AbgDAQoP (ORCPT ); Wed, 1 Apr 2020 12:44:15 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 2B6BC2063A; Wed, 1 Apr 2020 16:44:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585759454; bh=5MkXauhoehfgF1bchJUtFa+ktvr7TubTgXLAVcWSsPE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GMJZCm1PiJ7oGWgVSWFjIT0ICXL8mvjxojEUI2Zw5EQecmonSRVYIPeT929ddyqjE roVOCaErOSJzTeEin7AjOcQSUzoh6SXsIUYdgx6VFGvmXL28zwN62aKojPcmx8QO4F 3ay91iZJDYIcL49P6DnD1n6PGunFFIr97tjTStVM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Mark Rutland , Catalin Marinas , Suzuki Poulose , Will Deacon , Guenter Roeck Subject: [PATCH 4.14 085/148] arm64: ptrace: map SPSR_ELx<->PSR for compat tasks Date: Wed, 1 Apr 2020 18:17:57 +0200 Message-Id: <20200401161601.264697375@linuxfoundation.org> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200401161552.245876366@linuxfoundation.org> References: <20200401161552.245876366@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Mark Rutland commit 76fc52bd07d3e9cb708f1a50b60c825c96acd606 upstream. The SPSR_ELx format for exceptions taken from AArch32 is slightly different to the AArch32 PSR format. Map between the two in the compat ptrace code. Signed-off-by: Mark Rutland Fixes: 7206dc93a58fb764 ("arm64: Expose Arm v8.4 features") Cc: Catalin Marinas Cc: Suzuki Poulose Cc: Will Deacon Signed-off-by: Will Deacon Cc: Guenter Roeck Signed-off-by: Greg Kroah-Hartman --- arch/arm64/kernel/ptrace.c | 2 ++ 1 file changed, 2 insertions(+) --- a/arch/arm64/kernel/ptrace.c +++ b/arch/arm64/kernel/ptrace.c @@ -833,6 +833,7 @@ static int compat_gpr_get(struct task_st break; case 16: reg = task_pt_regs(target)->pstate; + reg = pstate_to_compat_psr(reg); break; case 17: reg = task_pt_regs(target)->orig_x0; @@ -900,6 +901,7 @@ static int compat_gpr_set(struct task_st newregs.pc = reg; break; case 16: + reg = compat_psr_to_pstate(reg); newregs.pstate = reg; break; case 17: