From nobody Mon Feb 9 09:51:55 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1555420330; cv=none; d=zoho.com; s=zohoarc; b=OX2WFCnvn7Kpevv6LeDTfeISCbEyCvDGOEtj+aVQ+IuqJXsS0btmKShrwJxnwnMldO8bMr4wbO4c+fp3r9bQV1kMonsCgw7y8aHSRUNZkEK/AH83zK4qE5C6p3TLs1AwMSnUB2uABI9WG2crtnaKrvPQEfeZtXd258QRn5k22cE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1555420330; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=oKhQw5TgUN0CJPeTbE7gAN8kI/N1+VlPzRCCDtvAZtE=; b=XXIecbRkcVQPVROZ2+N8hFlXcDWQgQQeQK0hpR4CMS1jbXT9MqCU77B+YkbjeHPQXwJ+iHhAGkt+1Din0u++dUYoLNjjizvfCLBhDVJdldmwB7qIGz2ZthPihVsece98uXjAR1szPC84P2JQMIv1rQ0/DU3K0m8P4WOz0V/4S3U= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 15554203305411014.0176617885452; Tue, 16 Apr 2019 06:12:10 -0700 (PDT) Received: from localhost ([127.0.0.1]:36528 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hGNsa-0007e1-Id for importer@patchew.org; Tue, 16 Apr 2019 09:12:04 -0400 Received: from eggs.gnu.org ([209.51.188.92]:34668) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hGNfJ-0004r8-PB for qemu-devel@nongnu.org; Tue, 16 Apr 2019 08:58:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hGNfI-0001M6-2A for qemu-devel@nongnu.org; Tue, 16 Apr 2019 08:58:21 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]:36148) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hGNfH-0001Kz-Oi for qemu-devel@nongnu.org; Tue, 16 Apr 2019 08:58:19 -0400 Received: by mail-wm1-x335.google.com with SMTP id h18so25327460wml.1 for ; Tue, 16 Apr 2019 05:58:19 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id v184sm39476572wma.6.2019.04.16.05.58.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Apr 2019 05:58:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=oKhQw5TgUN0CJPeTbE7gAN8kI/N1+VlPzRCCDtvAZtE=; b=HreNCUuvD0e5wQi79dWBWrQu3YZa7sNIr2l3kmLrc2xcNsq2h4683HclK6gO+ngrci JJCuYA9A+T3gDvIW5mvk/0YPo05OjNJPFsN30neivj+YJUQlyAaeqyvJ6x5QHcs/JA+Z mbwKJHL3UQ+lS5P3LS61SMqJtpC6sM3DxeS9KkXybVqskZjkVJ4vxMYljFnzXNS5wfSc e2fHGU4zj346ylL09uE5ZbVKuucmEf4ZIid7mtvQ2NSAi5qo9DHtONczqaqoDE5zLaoI glpWQUuAo2XasdZsXGjn+jq/KXlEbUCzgkNYNgjK415krxxnEYIjEFOJhAQP5hQ12jtE WZqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=oKhQw5TgUN0CJPeTbE7gAN8kI/N1+VlPzRCCDtvAZtE=; b=DVjwx+7CrrksnODN3sXmSDI0FgZo1Lvk+0QWqGP02CFBsKE5Wjn0DGcGu817dDfXGF HnyAlUKrIWlYjXaXbZU9H1xSPEksSmhV7MM24jgg/QCDey8Tz8epAQuqazwjvKAki70x ZbyrYrTX1lYSG8yqDf6Conw6qeV8bBSPSGSOoRe0LGtn//oC7baDHNBblq100uw84vxQ WwWRP/MtEa6qw2YriIrderWItWx9NBmbOX9vry9NxDIMhKQ6RHO1Qa8sbjvMWIODQxVX R18Cw/oY5B1PGQCGcZyNILItMLsBjukwmgSbnHHfmuenW7tL263/DZo7mB9s+f1LOtwh AYNA== X-Gm-Message-State: APjAAAXkDd22i93gXAjGSZNiNg/VK/HTdk8xywVGAMJE+4mfT6tBt3q3 czxvFQZwAAlRjzWu5nBz+JBPYQ== X-Google-Smtp-Source: APXvYqwl95al5Y3LOtRhbHMoOQ56YCImnsEa1pPOHGSI6GwjogiYdO5Gdp59W8agAfVht11CsZdYyA== X-Received: by 2002:a1c:f204:: with SMTP id s4mr26600232wmc.51.1555419498715; Tue, 16 Apr 2019 05:58:18 -0700 (PDT) From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Date: Tue, 16 Apr 2019 13:57:32 +0100 Message-Id: <20190416125744.27770-15-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190416125744.27770-1-peter.maydell@linaro.org> References: <20190416125744.27770-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::335 Subject: [Qemu-devel] [PATCH 14/26] target/arm: Allow for floating point in callee stack integrity check X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" The magic value pushed onto the callee stack as an integrity check is different if floating point is present. Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson --- target/arm/helper.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/target/arm/helper.c b/target/arm/helper.c index fe8e78fe36d..2f6382a0b24 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -7984,6 +7984,21 @@ load_fail: return false; } =20 +static uint32_t v7m_integrity_sig(CPUARMState *env, uint32_t lr) +{ + /* + * Return the integrity signature value for the callee-saves + * stack frame section. @lr is the exception return payload/LR value + * whose FType bit forms bit 0 of the signature if FP is present. + */ + uint32_t sig =3D 0xfefa125a; + + if (!arm_feature(env, ARM_FEATURE_VFP) || (lr & R_V7M_EXCRET_FTYPE_MAS= K)) { + sig |=3D 1; + } + return sig; +} + static bool v7m_push_callee_stack(ARMCPU *cpu, uint32_t lr, bool dotailcha= in, bool ignore_faults) { @@ -7998,6 +8013,7 @@ static bool v7m_push_callee_stack(ARMCPU *cpu, uint32= _t lr, bool dotailchain, bool stacked_ok; uint32_t limit; bool want_psp; + uint32_t sig; =20 if (dotailchain) { bool mode =3D lr & R_V7M_EXCRET_MODE_MASK; @@ -8039,8 +8055,9 @@ static bool v7m_push_callee_stack(ARMCPU *cpu, uint32= _t lr, bool dotailchain, /* Write as much of the stack frame as we can. A write failure may * cause us to pend a derived exception. */ + sig =3D v7m_integrity_sig(env, lr); stacked_ok =3D - v7m_stack_write(cpu, frameptr, 0xfefa125b, mmu_idx, ignore_faults)= && + v7m_stack_write(cpu, frameptr, sig, mmu_idx, ignore_faults) && v7m_stack_write(cpu, frameptr + 0x8, env->regs[4], mmu_idx, ignore_faults) && v7m_stack_write(cpu, frameptr + 0xc, env->regs[5], mmu_idx, @@ -8645,12 +8662,11 @@ static void do_v7m_exception_exit(ARMCPU *cpu) if (return_to_secure && ((excret & R_V7M_EXCRET_ES_MASK) =3D=3D 0 || (excret & R_V7M_EXCRET_DCRS_MASK) =3D=3D 0)) { - uint32_t expected_sig =3D 0xfefa125b; uint32_t actual_sig; =20 pop_ok =3D v7m_stack_read(cpu, &actual_sig, frameptr, mmu_idx); =20 - if (pop_ok && expected_sig !=3D actual_sig) { + if (pop_ok && v7m_integrity_sig(env, excret) !=3D actual_sig) { /* Take a SecureFault on the current stack */ env->v7m.sfsr |=3D R_V7M_SFSR_INVIS_MASK; armv7m_nvic_set_pending(env->nvic, ARMV7M_EXCP_SECURE, fal= se); --=20 2.20.1