diff --git a/Kernel/VM/MemoryManager.cpp b/Kernel/VM/MemoryManager.cpp
index 9053f201f3..5f6147ae54 100644
--- a/Kernel/VM/MemoryManager.cpp
+++ b/Kernel/VM/MemoryManager.cpp
@@ -569,6 +569,11 @@ template<MemoryManager::AccessSpace space, MemoryManager::AccessType access_type
 bool MemoryManager::validate_range(const Process& process, VirtualAddress base_vaddr, size_t size) const
 {
     ASSERT(size);
+    if (base_vaddr > base_vaddr.offset(size)) {
+        dbg() << "Shenanigans! Asked to validate wrappy " << base_vaddr << " size=" << size;
+        return false;
+    }
+
     VirtualAddress vaddr = base_vaddr.page_base();
     VirtualAddress end_vaddr = base_vaddr.offset(size - 1).page_base();
     if (end_vaddr < vaddr) {
diff --git a/Userland/test_efault.cpp b/Userland/test_efault.cpp
index e2d2d91eb9..d02140701c 100644
--- a/Userland/test_efault.cpp
+++ b/Userland/test_efault.cpp
@@ -47,6 +47,14 @@
         } \
     } while(0)
 
+#define EXPECT_EFAULT_NO_FD(syscall, address, size) \
+    do { \
+        rc = syscall((address), (size_t)(size)); \
+        if (rc >= 0 || errno != EFAULT) { \
+            fprintf(stderr, "Expected EFAULT: " #syscall "(%p, %zu), got rc=%d, errno=%d\n", (void*)(address), (size_t)(size), rc, errno); \
+        } \
+    } while(0)
+
 
 int main(int, char**)
 {
@@ -81,6 +89,9 @@ int main(int, char**)
         EXPECT_EFAULT(read, (void*)kernel_address, 1);
     }
 
+    char buffer[4096];
+    EXPECT_EFAULT_NO_FD(dbgputstr, buffer, 0xffffff00);
+
     // Test the page just below where the kernel VM begins.
     u8* jerk_page = (u8*)mmap((void*)(0xc0000000 - PAGE_SIZE), PAGE_SIZE, PROT_READ | PROT_WRITE, MAP_ANONYMOUS | MAP_PRIVATE | MAP_FIXED, 0, 0);
     ASSERT(jerk_page == (void*)(0xc0000000 - PAGE_SIZE));