yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-05-07 17:42:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

target-arm: Implement the S2 MMU inputsize > pamax check

Browse source 
Implement the inputsize > pamax check for Stage 2 translations.
This is CONSTRAINED UNPREDICTABLE and we choose to fault.

Backports commit 3526423e867765568ad95b8094ae8b4042cac215 from qemu
This commit is contained in:
Edgar E. Iglesias 2018-02-19 01:21:56 -05:00 committed by Lioncash
parent 71f370d549
commit 3ea1b2a84c
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
qemu/target-arm/helper.c
View file

@ -6137,6 +6137,7 @@ static bool check_s2_mmu_setup(ARMCPU *cpu, bool is_aa64, int level,
} }
if (is_aa64) { if (is_aa64) {
CPUARMState *env = &cpu->env;
unsigned int pamax = arm_pamax(cpu); unsigned int pamax = arm_pamax(cpu);
switch (stride) { switch (stride) {
@ -6158,6 +6159,13 @@ static bool check_s2_mmu_setup(ARMCPU *cpu, bool is_aa64, int level,
default: default:
g_assert_not_reached(); g_assert_not_reached();
} }
/* Inputsize checks. */
if (inputsize > pamax &&
(arm_el_is_aa64(env, 1) || inputsize > 40)) {
/* This is CONSTRAINED UNPREDICTABLE and we choose to fault. */
return false;
}
} else { } else {
/* AArch32 only supports 4KB pages. Assert on that. */ /* AArch32 only supports 4KB pages. Assert on that. */
assert(stride == 9); assert(stride == 9);