1 files changed, 2 insertions, 1 deletions

diff --git a/arch/x86/mm/cpu_entry_area.c b/arch/x86/mm/cpu_entry_area.c
index 21e8b595cbb1..fe814fd5e014 100644
--- a/arch/x86/mm/cpu_entry_area.c
+++ b/arch/x86/mm/cpu_entry_area.c
@@ -122,7 +122,8 @@ static __init void setup_cpu_entry_area_ptes(void)
         start = CPU_ENTRY_AREA_BASE;
         end = start + CPU_ENTRY_AREA_MAP_SIZE;
 
-        for (; start < end; start += PMD_SIZE)
+        /* Careful here: start + PMD_SIZE might wrap around */
+        for (; start < end && start >= CPU_ENTRY_AREA_BASE; start += PMD_SIZE)
                 populate_extra_pte(start);
 #endif
 }