Received: by 2002:a17:90a:1609:0:0:0:0 with SMTP id n9csp851110pja; Wed, 1 Apr 2020 09:50:16 -0700 (PDT) X-Google-Smtp-Source: ADFU+vvGG/Sg4DDT3kwU3ezOazTf3epGjyYLaeQqwaObwIbCk1qCEKpUQJlvnOLqbWdjOQ0SgFn8 X-Received: by 2002:a9d:5f18:: with SMTP id f24mr12647486oti.325.1585759816761; Wed, 01 Apr 2020 09:50:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585759816; cv=none; d=google.com; s=arc-20160816; b=C72ONl13YztiSk+POtErKtZunZ64t7mkMhXEG6h1KLrpEdMQd7cWzI+WXbaEGZ1tkH WUiVEszrKbZzbtM2XPalRmgW/3z/kWjBZG+JUQdIWZYsPyYfq07ividFTpbt1xBYF7yF eSeRkh4LrkDMIkROrRPNRh8kVDqBnogDcH5ZhSM9bFNfcsKViGAc84SrsQwOkFa3Whdv DZfg5/zdwm2mPcKohxkcr7pfT1x4ItKUk4htCS9b4q2OZ67ND4bZ5cRs9AUJrf5kPaPs T2zyd8xt0vyi8D4Gla0UT1egopZk7DjkokBPmrgJjsX+MmF0CuGwJB4YvNH7hMa/upyu FiQg== 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=2SmfApuG6Y9A3L4CKAWGMi3HPorKjyhvuun/ZQDY4ZY=; b=Kj8uTYH46IouPXjKnM6TL11VcKJW3CrI1InOKZK72q1RcpTX4XNy/dkSrfP3Uv1ZRz AQsCENBQNl9+1oePvrZm4y9P9shmIl37ctkpLfurSDEqu0ULBKG+Jsh060gZcDSuw7gq Xf6P7eG6a6XDF7z6FbVICBzM4FhtZbbk/1wNgOc1dKrjkqTmirP1iPLaHHTA2AWJBHED P9h16gQUbcHcSYHRkF8iRJgxwYt801fC/UmLIm4/yJaTslyxjoUpjcnLbrm1mJ9vv7Tp c+ufavYtnl02TyQ4ZSrWPhLKgmVO0jX21TXUY93UpFPPo8J2NMUUOAgeFpwZsR+n5NhZ EXOQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=FdZBFBN2; 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 z62si1116984oiz.23.2020.04.01.09.50.04; Wed, 01 Apr 2020 09:50: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=FdZBFBN2; 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 S2387980AbgDAQoU (ORCPT + 99 others); Wed, 1 Apr 2020 12:44:20 -0400 Received: from mail.kernel.org ([198.145.29.99]:45254 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389157AbgDAQoR (ORCPT ); Wed, 1 Apr 2020 12:44:17 -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 B2E0B206E9; Wed, 1 Apr 2020 16:44:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585759457; bh=fMRsRQ+65f7C+MmvTPcopeURpod73xJ3PavLOx/8fiE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FdZBFBN2FPqimWYi6CuuuCDcoaZLo6Weor0VSjVtd4UlhRNVcFP03/sVcjkKs5dN6 fnjcsJa9/pkeCQ0FBzio91fPET3TYuxTIFAO3vv1HOCN5OBUv0Vv+75JDPHgNFL5NY lfk9WiTocPbi9Zy4v1H8GnnTa0xKFoY+VzEK/aMg= 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 086/148] arm64: compat: map SPSR_ELx<->PSR for signals Date: Wed, 1 Apr 2020 18:17:58 +0200 Message-Id: <20200401161601.333675944@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 25dc2c80cfa33153057aa94984855acd57adf92a upstream. The SPSR_ELx format for exceptions taken from AArch32 differs from the AArch32 PSR format. Thus, we must translate between the two when setting up a compat sigframe, or restoring context from a compat sigframe. 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/signal32.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) --- a/arch/arm64/kernel/signal32.c +++ b/arch/arm64/kernel/signal32.c @@ -321,6 +321,7 @@ static int compat_restore_sigframe(struc int err; sigset_t set; struct compat_aux_sigframe __user *aux; + unsigned long psr; err = get_sigset_t(&set, &sf->uc.uc_sigmask); if (err == 0) { @@ -344,7 +345,9 @@ static int compat_restore_sigframe(struc __get_user_error(regs->compat_sp, &sf->uc.uc_mcontext.arm_sp, err); __get_user_error(regs->compat_lr, &sf->uc.uc_mcontext.arm_lr, err); __get_user_error(regs->pc, &sf->uc.uc_mcontext.arm_pc, err); - __get_user_error(regs->pstate, &sf->uc.uc_mcontext.arm_cpsr, err); + __get_user_error(psr, &sf->uc.uc_mcontext.arm_cpsr, err); + + regs->pstate = compat_psr_to_pstate(psr); /* * Avoid compat_sys_sigreturn() restarting. @@ -500,6 +503,7 @@ static int compat_setup_sigframe(struct struct pt_regs *regs, sigset_t *set) { struct compat_aux_sigframe __user *aux; + unsigned long psr = pstate_to_compat_psr(regs->pstate); int err = 0; __put_user_error(regs->regs[0], &sf->uc.uc_mcontext.arm_r0, err); @@ -518,7 +522,7 @@ static int compat_setup_sigframe(struct __put_user_error(regs->compat_sp, &sf->uc.uc_mcontext.arm_sp, err); __put_user_error(regs->compat_lr, &sf->uc.uc_mcontext.arm_lr, err); __put_user_error(regs->pc, &sf->uc.uc_mcontext.arm_pc, err); - __put_user_error(regs->pstate, &sf->uc.uc_mcontext.arm_cpsr, err); + __put_user_error(psr, &sf->uc.uc_mcontext.arm_cpsr, err); __put_user_error((compat_ulong_t)0, &sf->uc.uc_mcontext.trap_no, err); /* set the compat FSR WnR */