[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 1/2] domain: fix misaligned unmap address in {,un}map_guest_area()
- To: xen-devel@xxxxxxxxxxxxxxxxxxxx
- From: Roger Pau Monne <roger.pau@xxxxxxxxxx>
- Date: Fri, 6 Oct 2023 15:00:58 +0200
- Arc-authentication-results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=citrix.com; dmarc=pass action=none header.from=citrix.com; dkim=pass header.d=citrix.com; arc=none
- Arc-message-signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=thBVzZHE25HD5UvaIrP9q3ANVbkmnqpnKglf4PdZI5g=; b=O/NGxsXNcSyi481lwWl1aPdP4ZZpPK38mbI8SJpVNc7fJzcsZaDRdTfKLPAxS35WYSeRHY684+ubNrrAyJatDIEBuK2PcM5xSy3bgf+hW5u8NvEFJOOk5tUyZBvg0OWJ2L9Geoc32numoBWhRrcsQYYctbLC5Iumm5FbIotdu7EbieNYjjHdfrjeifRAlpF8xhwy6NJUGmXPO1e+7W9Ede517zr2var5p8eF6p6ZPo71QPAJ8egAN6cBzuFUIjdqYkwi3dWw18fkmMlbQSelLyFw6EpWePlJ2Cdouhw2Lp9wXzUjXku6BhCJ+qscqdy2fmEmdfforODYk3V9akbdRQ==
- Arc-seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YnMzNDRQq8o8TcWWguHw07fZkaPcaLuvv+zoCKL8D+ornZfO6eD9VmXRUUmD0P/2yomvWK1FyItNvvMdM9xINv0QNeLk3aLEEh5z/9jaCsL1I5e0RC2PY11HFqtMvPUR+eojs1F+s0v3v2vR4gIh7wl8wskKlX6K6U0yFwE3GuVaRrbQDzDWkXcyfllhk9gJuaKa9hKOoqu2wW0RSNKBNKtMd8lXDbA8bTkDSM92xAg/Odnn2Qj7pJuW1PqdIWcue3a1/PkZbosJ7fFx/5FTC4jnHdBSB6lBi1S1bMRpfgx4IGNZZo1vMEOF3ixXmvLx43VZZCejZcCSn1a+HFwbCg==
- Authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=citrix.com;
- Cc: Henry Wang <Henry.Wang@xxxxxxx>, Roger Pau Monne <roger.pau@xxxxxxxxxx>, Andrew Cooper <andrew.cooper3@xxxxxxxxxx>, George Dunlap <george.dunlap@xxxxxxxxxx>, Jan Beulich <jbeulich@xxxxxxxx>, Julien Grall <julien@xxxxxxx>, Stefano Stabellini <sstabellini@xxxxxxxxxx>, Wei Liu <wl@xxxxxxx>
- Delivery-date: Fri, 06 Oct 2023 13:02:03 +0000
- Ironport-data: A9a23:jGq7zq7kU4eKT5he9G4WvQxRtOLGchMFZxGqfqrLsTDasY5as4F+v mEYXW+Ha/6CMzH0LYt+adyyp0MPvsOHztdnGgJtqytmHi5G8cbLO4+Ufxz6V8+wwm8vb2o8t plDNYOQRCwQZiWBzvt4GuG59RGQ7YnRG/ykTraCY3gtLeNdYH9JoQp5nOIkiZJfj9G8Agec0 fv/uMSaM1K+s9JOGjt8B5mr9lU355wehBtC5gZlPKgT4geH/5UoJMl3yZ+ZfiOQrrZ8RoZWd 86bpJml82XQ+QsaC9/Nut4XpWVTH9Y+lSDX4pZnc/DKbipq/0Te4Y5iXBYoUm9Fii3hojxE4 I4lWapc6+seFvakdOw1C3G0GszlVEFM0OevzXOX6aR/w6BaGpdFLjoH4EweZOUlFuhL7W5m3 +JGDRoOVi+/uuuN+ZnrEft0p4MTM5y+VG8fkikIITDxK98DGMmGaYOaoNhS0XE3m9xEGuvYa 4wBcz1zYR/cYhpJfFAKFJY5m+TujX76G9FagAvN+exrvC6OnEoojumF3Nn9I7RmQe1PmUmVv CTe9nnRCRAGLt2PjzGC9xpAg8eWx36hBd5LTezQGvhCqX2o50o/CVoqeni7nNO01WmRWolcN BlBksYphe1onKCxdfHtUhv9rHOasxo0X9tLD/Z8+AyL0rDT4QuSGi4DVDEpQPwrstUnAwMj0 FChlsnsQzdotdW9S3iQ67OVpjOaIjUOICkJYipsZQkY59jupqkjgxSJScxseIaulcH8Ezz0x zGMrQA9iq8VgMpN0L+0lXjYhxq8q56PSRQ6jjg7RUqg5wJ9IYSjN4qh7AGC6e4addjICF6co HIDhs6SqvgUCo2AnzCMR+NLG6y14/GCM3vXhlsH84QdyglBMkWLJeh4iAyS7m8wWirYUVcFu HPuhD4=
- Ironport-hdrordr: A9a23:YLL766k8auY2aYM1r6K4Arf0GUvpDfIi3DAbv31ZSRFFG/Fw9v rDoB1/73TJYVkqN03I9ervBEDjexPhHO9OgLX5VI3KNGOKhILCFvAA0WKN+UyEJwTOssJbyK d8Y+xfJbTLfDxHZB/BkWuFL+o=
- List-id: Xen developer discussion <xen-devel.lists.xenproject.org>
unmap_domain_page_global() expects the provided address to be page aligned, or
else some of the called functions will trigger assertions, like
modify_xen_mappings() on x86 or destroy_xen_mappings() on Arm.
The following assert has been reported by osstest arm 32bit tests:
(XEN) Assertion 'IS_ALIGNED(s, PAGE_SIZE)' failed at arch/arm/mm.c:1243
(XEN) ----[ Xen-4.18-rc arm32 debug=y Not tainted ]----
(XEN) CPU: 0
(XEN) PC: 00271a38 destroy_xen_mappings+0x50/0x5c
[...]
(XEN) Xen call trace:
(XEN) [<00271a38>] destroy_xen_mappings+0x50/0x5c (PC)
(XEN) [<00235aa8>] vunmap+0x30/0x1a0 (LR)
(XEN) [<0026ad88>] unmap_domain_page_global+0x10/0x20
(XEN) [<00208e38>] unmap_guest_area+0x90/0xec
(XEN) [<00208f98>] domain_kill+0x104/0x180
(XEN) [<00239e3c>] do_domctl+0x8ac/0x14fc
(XEN) [<0027ae34>] do_trap_guest_sync+0x570/0x66c
(XEN) [<002019f0>] arch/arm/arm32/entry.o#return_from_trap+0/0x4
Fixes: eadc288cbb0d ('domain: map/unmap GADDR based shared guest areas')
Signed-off-by: Roger Pau Monné <roger.pau@xxxxxxxxxx>
---
Changes since v1:
- Also page-align the address in map_guest_area().
---
xen/common/domain.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/xen/common/domain.c b/xen/common/domain.c
index b8281d7cff9d..1468638ade8b 100644
--- a/xen/common/domain.c
+++ b/xen/common/domain.c
@@ -1601,7 +1601,7 @@ int map_guest_area(struct vcpu *v, paddr_t gaddr,
unsigned int size,
unmap:
if ( pg )
{
- unmap_domain_page_global(map);
+ unmap_domain_page_global((void *)((unsigned long)map & PAGE_MASK));
put_page_and_type(pg);
}
@@ -1634,7 +1634,7 @@ void unmap_guest_area(struct vcpu *v, struct guest_area
*area)
if ( pg )
{
- unmap_domain_page_global(map);
+ unmap_domain_page_global((void *)((unsigned long)map & PAGE_MASK));
put_page_and_type(pg);
}
}
--
2.42.0
|
