From 628928c7fa9f1e2369e6613ea964535abe18a02f Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Mon, 30 Mar 2009 21:55:23 -0600 Subject: [PATCH] --- yaml --- r: 139073 b: refs/heads/master c: 6afbdd059c27330eccbd85943354f94c2b83a7fe h: refs/heads/master i: 139071: 76b02535a2b817eff6fa34ce9951ff6730c3c82e v: v3 --- [refs] | 2 +- trunk/drivers/lguest/page_tables.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 38732057202e..9cff639d0864 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c5f841f1780dad7efb7eca092f60742d47f47d25 +refs/heads/master: 6afbdd059c27330eccbd85943354f94c2b83a7fe diff --git a/trunk/drivers/lguest/page_tables.c b/trunk/drivers/lguest/page_tables.c index 576a8318221c..82ff484bd8c8 100644 --- a/trunk/drivers/lguest/page_tables.c +++ b/trunk/drivers/lguest/page_tables.c @@ -373,8 +373,10 @@ unsigned long guest_pa(struct lg_cpu *cpu, unsigned long vaddr) /* First step: get the top-level Guest page table entry. */ gpgd = lgread(cpu, gpgd_addr(cpu, vaddr), pgd_t); /* Toplevel not present? We can't map it in. */ - if (!(pgd_flags(gpgd) & _PAGE_PRESENT)) + if (!(pgd_flags(gpgd) & _PAGE_PRESENT)) { kill_guest(cpu, "Bad address %#lx", vaddr); + return -1UL; + } gpte = lgread(cpu, gpte_addr(gpgd, vaddr), pte_t); if (!(pte_flags(gpte) & _PAGE_PRESENT))