From nobody Tue Feb 10 08:24:24 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1647310388; cv=none; d=zohomail.com; s=zohoarc; b=iNWAhIo3YP8QzO+BEVYZlXum/gQ/nwAdACvnvOlS99p0K5mqo5J9kwja8hdsUuj4ZCZuOcro5faImLEe1Tv/XpjxZPoI1M0gSkee3NK3vdQId+hJZk+hHZUbFwfQPl+MOsogUeF6ye5JOvFQnVhCwYOOXSAZTW5g/LnbclIonKs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1647310388; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=nPCyHm7z8svGYiIpoMfMBWpG43kIvw3IKZt4zZOcxVM=; b=P2U9b7ZioPbTkKoyvH5dGJH2+lsC1RbTRveMG1N6x1MHP927832FUFKeWdySNvo8o8CG+n6Vw9k+keyNxvtoJaB2qzRDr3TApkZhRzTnpuRYTrz7p+XQXbhyzPbwX67SjtD2cJ3SpmFufA4Oh4Q+ByYrJ30DY2Yfq8KzX1QmIAI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1647310388690568.7322699678251; Mon, 14 Mar 2022 19:13:08 -0700 (PDT) Received: from localhost ([::1]:39998 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nTwgO-0000fH-3T for importer@patchew.org; Mon, 14 Mar 2022 22:13:08 -0400 Received: from eggs.gnu.org ([209.51.188.92]:53580) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nTwfS-0007od-4G for qemu-devel@nongnu.org; Mon, 14 Mar 2022 22:12:10 -0400 Received: from [2607:f8b0:4864:20::433] (port=45659 helo=mail-pf1-x433.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nTwfQ-0001Vw-Dd for qemu-devel@nongnu.org; Mon, 14 Mar 2022 22:12:09 -0400 Received: by mail-pf1-x433.google.com with SMTP id s8so17175288pfk.12 for ; Mon, 14 Mar 2022 19:12:07 -0700 (PDT) Received: from localhost.localdomain (174-21-142-130.tukw.qwest.net. [174.21.142.130]) by smtp.gmail.com with ESMTPSA id 10-20020a17090a004a00b001c44ffccebdsm802627pjb.43.2022.03.14.19.12.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Mar 2022 19:12:06 -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:mime-version :content-transfer-encoding; bh=nPCyHm7z8svGYiIpoMfMBWpG43kIvw3IKZt4zZOcxVM=; b=esMDmjzBs04dA7xZCyR2KqjXxrFbluzpRqqBgIWk85c6wQdIIfSHirInLMmPOHVpD1 SVBL9awRcugYYkU1KIKLJb0PgWy2Tt1sK0pVMPGkDQ/ppTTsLpDv2hxq9qKDVzZ24FO6 N6AZLf+ICLSHY9KV1vN7BrY72q9QrsUjhWa15UynRjNXa/iFmtztnMSzGqaA8JMSEX5k UF0y9FwEyZuDdRNNAQ6ci/xLUMaV+VkWguj0yb9AZ00UndzaSegYHLYN7JCvjhMRSqfv 45oQ/jqHTKwO/SxEVTy7j8RBtxY3o0igf5fDJHBYFfcCT6MWSx9vlMDanu8iioq/uFL3 4Ouw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=nPCyHm7z8svGYiIpoMfMBWpG43kIvw3IKZt4zZOcxVM=; b=ft5f8VaOXVHM8U0mx2gNifSGdzPWUQVxnvWwLIyPYaQ62FtaIzaOlbdrkIc8ijZhw6 cn6kVoaunAM3MnScQTPBUKragI/xykd7DHFsvcuc0V2qUMy5u1CEn22hkcRJZn/qFMzq k7MM1idXDYoXC4S/b9AlDHDi+7IBrvA/JqmknbLZ3H3/PQXPPy+dT9+cXL9Mg9JKJIxn BWkx+1Dozzv7pKWZlZXepPOydexnYb/CSzNA2AdpjXwXUF9xwNVe0dzSybuGolbtLWR/ A9EjTN9R0hC2GeA9n10ZR+3gIMITbSqRpCYWIZA1Qy+C0f+kfDH9U6VFxjdr2jtGKCN/ Uixw== X-Gm-Message-State: AOAM532iMJLJgFCnfHov4pnFHjXLzNroZSoceCDTSZrAOxTb74lU88Yv JmMZRh+8a+tcD72pTj8d6pvrdygO31HbzQ== X-Google-Smtp-Source: ABdhPJxxpTHBrSE6N04nmCRnn9vB83seWwAQYL3hj8oi6kV9qTxzxGXZMegCkmaspTmboJGonxmwWQ== X-Received: by 2002:a05:6a00:309c:b0:4f7:a5ca:4e20 with SMTP id bh28-20020a056a00309c00b004f7a5ca4e20mr14817106pfb.26.1647310326480; Mon, 14 Mar 2022 19:12:06 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH] target/arm: Fix pauth_check_trap vs SEL2 Date: Mon, 14 Mar 2022 19:12:05 -0700 Message-Id: <20220315021205.342768-1-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::433 (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::433; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x433.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-arm@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1647310414676100001 Content-Type: text/plain; charset="utf-8" When arm_is_el2_enabled was introduced, we missed updating pauth_check_trap. Resolves: https://gitlab.com/qemu-project/qemu/-/issues/788 Fixes: e6ef0169264b ("target/arm: use arm_is_el2_enabled() where applicable= ") Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- target/arm/pauth_helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/arm/pauth_helper.c b/target/arm/pauth_helper.c index cd6df18150..739aa520dd 100644 --- a/target/arm/pauth_helper.c +++ b/target/arm/pauth_helper.c @@ -390,7 +390,7 @@ static void QEMU_NORETURN pauth_trap(CPUARMState *env, = int target_el, =20 static void pauth_check_trap(CPUARMState *env, int el, uintptr_t ra) { - if (el < 2 && arm_feature(env, ARM_FEATURE_EL2)) { + if (el < 2 && arm_is_el2_enabled(env)) { uint64_t hcr =3D arm_hcr_el2_eff(env); bool trap =3D !(hcr & HCR_API); if (el =3D=3D 0) { --=20 2.25.1