]> git.ipfire.org Git - thirdparty/qemu.git/commitdiff
target/mips: fix TLB huge page check to use 64-bit shift
authorDenis Rastyogin <gerben@altlinux.org>
Thu, 14 Aug 2025 10:48:32 +0000 (13:48 +0300)
committerMichael Tokarev <mjt@tls.msk.ru>
Sat, 6 Sep 2025 20:59:17 +0000 (23:59 +0300)
Use extract64(entry, psn, 1) instead of (entry & (1 << psn)) to avoid
undefined behavior for shifts by 32–63 and to make bit extraction intent explicit.

Found by Linux Verification Center (linuxtesting.org) with SVACE.

Signed-off-by: Denis Rastyogin <gerben@altlinux.org>
Message-ID: <20250814104914.13101-1-gerben@altlinux.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
(cherry picked from commit 1f82ca723478f44823a18e7151e487d58da03659)
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
target/mips/tcg/sysemu/tlb_helper.c

index cce3dcdc0e86c583c922f1107af9a1839fead908..a502426be6df8f3b7549e6fa7d9f7f696f7e76bc 100644 (file)
@@ -653,7 +653,7 @@ static int walk_directory(CPUMIPSState *env, uint64_t *vaddr,
         return 0;
     }
 
-    if ((entry & (1 << psn)) && hugepg) {
+    if (extract64(entry, psn, 1) && hugepg) {
         *huge_page = true;
         *hgpg_directory_hit = true;
         entry = get_tlb_entry_layout(env, entry, leafentry_size, pf_ptew);