From: Eric Auger <eric.auger@redhat.com>
To: eric.auger.pro@gmail.com, eric.auger@redhat.com,
qemu-devel@nongnu.org, qemu-arm@nongnu.org,
peter.maydell@linaro.org, berrange@redhat.com,
skolothumtho@nvidia.com, nicolinc@nvidia.com, nathanc@nvidia.com
Subject: [PATCH v2 3/5] hw/arm/smmuv3: Sanitize SMMU_S_STRTAB_BASE_CFG.LOG2SIZE
Date: Wed, 1 Jul 2026 11:11:40 +0200 [thread overview]
Message-ID: <20260701091209.2860306-4-eric.auger@redhat.com> (raw)
In-Reply-To: <20260701091209.2860306-1-eric.auger@redhat.com>
STRTAB_BASE_CFG.LOG2SIZE is programmed by the guest through the
emulated SMMUv3 MMIO register interface. Currently the value is
not checked and used directly in smmu_find_ste() for strtab_base
alignment computation with risk that MAKE_64BIT_MASK() runs out
of bounds. On FMT==1 the strtab_size cannot be greater than 64 after
the SPLIT being at minimum 6 (log2size is max 64).
However on FMT=0 path, strtab_size= log2size + 6 can potentially
exceed 64. Let's abort in that case.
Resolves: https://gitlab.com/qemu-project/qemu/-/work_items/3632
Signed-off-by: Eric Auger <eric.auger@redhat.com>
---
hw/arm/smmuv3.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/hw/arm/smmuv3.c b/hw/arm/smmuv3.c
index 285e6164a07..5ec3700d0d5 100644
--- a/hw/arm/smmuv3.c
+++ b/hw/arm/smmuv3.c
@@ -1696,6 +1696,14 @@ static MemTxResult smmu_writel(SMMUv3State *s, hwaddr offset,
s->sid_split = 6;
}
s->features |= SMMU_FEATURE_2LVL_STE;
+ } else {
+ uint32_t log2size = FIELD_EX32(data, STRTAB_BASE_CFG, LOG2SIZE);
+
+ if (log2size + 6 > 64) {
+ qemu_log_mask(LOG_GUEST_ERROR,
+ "Invalid STRTAB_BASE_CFG.LOG2SIZE: %d", log2size);
+ g_assert_not_reached();
+ }
}
break;
case A_CMDQ_BASE: /* 64b */
--
2.53.0
next prev parent reply other threads:[~2026-07-01 9:15 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-07-01 9:11 [PATCH v2 0/5] SMMUV3: STE lookup fixes Eric Auger
2026-07-01 9:11 ` [PATCH v2 1/5] hw/arm/smmuv3: Fix off-by-one bug in alignment strtab mask Eric Auger
2026-07-03 9:09 ` Shameer Kolothum Thodi
2026-07-03 9:20 ` Philippe Mathieu-Daudé
2026-07-01 9:11 ` [PATCH v2 2/5] hw/arm/smmuv3: Sanitize SMMU_S_STRTAB_BASE_CFG.SPLIT Eric Auger
2026-07-01 9:11 ` Eric Auger [this message]
2026-07-03 9:22 ` [PATCH v2 3/5] hw/arm/smmuv3: Sanitize SMMU_S_STRTAB_BASE_CFG.LOG2SIZE Shameer Kolothum Thodi
2026-07-03 12:54 ` Peter Maydell
2026-07-01 9:11 ` [PATCH v2 4/5] hw/arm/smmuv3: Check L1STD.SPAN Eric Auger
2026-07-03 9:35 ` Shameer Kolothum Thodi
2026-07-01 9:11 ` [PATCH v2 5/5] hw/arm/smmuv3: Enforce alignment of L2Ptr according to the span Eric Auger
2026-07-03 9:37 ` Shameer Kolothum Thodi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260701091209.2860306-4-eric.auger@redhat.com \
--to=eric.auger@redhat.com \
--cc=berrange@redhat.com \
--cc=eric.auger.pro@gmail.com \
--cc=nathanc@nvidia.com \
--cc=nicolinc@nvidia.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=skolothumtho@nvidia.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.