]> xenbits.xensource.com Git - people/liuw/libxenctrl-split/xen.git/commit
arm: p2m.c bug-fix: hypervisor hang on __p2m_get_mem_access
authorCorneliu ZUZU <czuzu@bitdefender.com>
Wed, 27 Jan 2016 12:24:35 +0000 (14:24 +0200)
committerIan Campbell <ian.campbell@citrix.com>
Wed, 3 Feb 2016 11:20:07 +0000 (11:20 +0000)
commit6b1c74abc90273efaa749022bd5367330d20aab6
treee52b9fffc8bf5b06ba2633b763a6db0de04b48ca
parenta58aeaabb4d507f4c797d3817d94e3041252b9eb
arm: p2m.c bug-fix: hypervisor hang on __p2m_get_mem_access

When __p2m_get_mem_access gets called, the p2m lock is already taken
by either get_page_from_gva or p2m_get_mem_access.

Possible code paths:
1) -> get_page_from_gva
-> p2m_mem_access_check_and_get_page
-> __p2m_get_mem_access
2) -> p2m_get_mem_access
-> __p2m_get_mem_access

In both cases if __p2m_get_mem_access subsequently gets to
call p2m_lookup (happens if !radix_tree_lookup(...)), a hypervisor
hang will occur, since p2m_lookup also spin-locks on the p2m lock.

This bug-fix simply replaces the p2m_lookup call from __p2m_get_mem_access
with a call to __p2m_lookup.

Following Ian's suggestion, we also add an ASSERT to ensure that
the p2m lock is taken upon __p2m_get_mem_access entry.

Signed-off-by: Corneliu ZUZU <czuzu@bitdefender.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
xen/arch/arm/p2m.c