projects/linux·commit df912ea4

xen: execve's error paths don't pin the mm before unpinning

df912ea4 · Jeremy Fitzhardinge <[email protected]> · 2007-09-25 11:50:00 -07:00

execve's error paths don't activate (and therefore pin) the mm before
calling exit_mmap to free it up, so don't try to unpin unless it is
actually pinned.  This prevents a BUG_ON from triggering.

Signed-off-by: Jeremy Fitzhardinge <[email protected]>
Cc: Christian Ostheimer <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
Commit
df912ea4ae7233d1504fbd861ee127bd7ee5781d
Parents
e66485d7

Changes

1 files changed · +4 −1

FileStatusAddDelContent
arch/i386/xen/mmu.cmodified+4−1View file

arch/i386/xen/mmu.c

View file
diff --git a/arch/i386/xen/mmu.c b/arch/i386/xen/mmu.c
index 4ae038a..874db0c 100644
--- a/arch/i386/xen/mmu.c
+++ b/arch/i386/xen/mmu.c
@@ -559,6 +559,9 @@ void xen_exit_mmap(struct mm_struct *mm)
put_cpu();
spin_lock(&mm->page_table_lock);
- xen_pgd_unpin(mm->pgd);
+
+ /* pgd may not be pinned in the error exit path of execve */
+ if (PagePinned(virt_to_page(mm->pgd)))
+ xen_pgd_unpin(mm->pgd);
spin_unlock(&mm->page_table_lock);
}