mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 02:01:24 +01:00
xen/arm: p2m: Always clear the P2M entry when the mapping is removed
Commit2148a125b7("xen/arm: Track page accessed between batch of Set/Way operations") allowed an entry to be invalid from the CPU PoV (lpae_is_valid()) but valid for Xen (p2m_is_valid()). This is useful to track which page is accessed and only perform an action on them (e.g. clean & invalidate the cache after a set/way instruction). Unfortunately, __p2m_set_entry() is only zeroing the P2M entry when lpae_is_valid() returns true. This means the entry will not be zeroed if the entry was valid from Xen PoV but invalid from the CPU PoV for tracking purpose. As a consequence, this will allow a domain to continue to access the page after it was removed. Resolve the issue by always zeroing the entry if it the LPAE bit is set or the entry is about to be removed. This is CVE-2022-23033 / XSA-393. Reported-by: Dmytro Firsov <Dmytro_Firsov@epam.com> Fixes:2148a125b7("xen/arm: Track page accessed between batch of Set/Way operations") Reviewed-by: Stefano Stabellini <sstabellini@kernel.org> Signed-off-by: Julien Grall <jgrall@amazon.com> master commit:a428b913a0master date: 2022-01-25 13:25:01 +0100
This commit is contained in:
1 parent
a763f8f158
commit
53220c4f9d
1 file changed
+1
-1
+1
-1
@@ -1016,7 +1016,7 @@ static int __p2m_set_entry(struct p2m_domain *p2m,
|
||||
* sequence when updating the translation table (D4.7.1 in ARM DDI
|
||||
* 0487A.j).
|
||||
*/
|
||||
if ( lpae_is_valid(orig_pte) )
|
||||
if ( lpae_is_valid(orig_pte) || removing_mapping )
|
||||
p2m_remove_pte(entry, p2m->clean_pte);
|
||||
|
||||
if ( removing_mapping )
|
||||
|
||||