Commit df912ea4 authored by Jeremy Fitzhardinge's avatar Jeremy Fitzhardinge Committed by Linus Torvalds

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

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: default avatarJeremy Fitzhardinge <jeremy@xensource.com>
Cc: Christian Ostheimer <osth@freesurf.ch>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e66485d7
...@@ -559,6 +559,9 @@ void xen_exit_mmap(struct mm_struct *mm) ...@@ -559,6 +559,9 @@ void xen_exit_mmap(struct mm_struct *mm)
put_cpu(); put_cpu();
spin_lock(&mm->page_table_lock); 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); spin_unlock(&mm->page_table_lock);
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment