]> www.infradead.org Git - users/dwmw2/qemu.git/commitdiff
target/arm: Fix exception case in allocation_tag_mem_probe
authorGustavo Romero <gustavo.romero@linaro.org>
Fri, 5 Jul 2024 08:40:40 +0000 (09:40 +0100)
committerAlex Bennée <alex.bennee@linaro.org>
Fri, 5 Jul 2024 11:35:07 +0000 (12:35 +0100)
If page in 'ptr_access' is inaccessible and probe is 'true'
allocation_tag_mem_probe should not throw an exception, but currently it
does, so fix it.

Signed-off-by: Gustavo Romero <gustavo.romero@linaro.org>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20240628050850.536447-5-gustavo.romero@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20240705084047.857176-34-alex.bennee@linaro.org>

target/arm/tcg/mte_helper.c

index 037ac6dd60d0913d26b35fb5f209cfe045c40eae..a50d576294ddc00a61431a5761ece02cebf1c062 100644 (file)
@@ -96,6 +96,9 @@ static uint8_t *allocation_tag_mem_probe(CPUARMState *env, int ptr_mmu_idx,
     assert(!(probe && ra));
 
     if (!(flags & (ptr_access == MMU_DATA_STORE ? PAGE_WRITE_ORG : PAGE_READ))) {
+        if (probe) {
+            return NULL;
+        }
         cpu_loop_exit_sigsegv(env_cpu(env), ptr, ptr_access,
                               !(flags & PAGE_VALID), ra);
     }