Skip to contentSkip to conversation

Patch "Xen: ARM: Zero reserved fields of xatp before making hypervisor call" has been added to the 4.9-stable tree

PATCH [email protected] 1 participant 1 message Aug 4, 2017

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

Xen: ARM: Zero reserved fields of xatp before making hypervisor call

to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
xen-arm-zero-reserved-fields-of-xatp-before-making-hypervisor-call.patch
and it can be found in the queue-4.9 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From foo@baz Fri Aug 4 15:15:01 PDT 2017

From: Jiandi An <[email protected]>
Date: Tue, 27 Dec 2016 18:47:32 -0600
Subject: Xen: ARM: Zero reserved fields of xatp before making hypervisor call

From: Jiandi An <[email protected]>

[ Upstream commit 0b47a6bd1150f4846b1d61925a4cc5a96593a541 ]

Ensure all reserved fields of xatp are zero before making hypervisor call to XEN in xen_map_device_mmio(). xenmem_add_to_physmap_one() in XEN fails the mapping request if extra.res reserved field in xatp is not zero for XENMAPSPACE_dev_mmio request.

---
 drivers/xen/arm-device.c |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/xen/arm-device.c +5 -3
@@ -58,9 +58,13 @@ static int xen_map_device_mmio(const str
 	xen_pfn_t *gpfns;
 	xen_ulong_t *idxs;
 	int *errs;
-	struct xen_add_to_physmap_range xatp;
 
 	for (i = 0; i < count; i++) {
+		struct xen_add_to_physmap_range xatp = {
+			.domid = DOMID_SELF,
+			.space = XENMAPSPACE_dev_mmio
+		};
+
 		r = &resources[i];
 		nr = DIV_ROUND_UP(resource_size(r), XEN_PAGE_SIZE);
 		if ((resource_type(r) != IORESOURCE_MEM) || (nr == 0))
@@ -87,9 +91,7 @@ static int xen_map_device_mmio(const str
 			idxs[j] = XEN_PFN_DOWN(r->start) + j;
 		}
 
-		xatp.domid = DOMID_SELF;
 		xatp.size = nr;
-		xatp.space = XENMAPSPACE_dev_mmio;
 
 		set_xen_guest_handle(xatp.gpfns, gpfns);
 		set_xen_guest_handle(xatp.idxs, idxs);

Patches currently in stable-queue which might be from [email protected] are

queue-4.9/xen-arm-zero-reserved-fields-of-xatp-before-making-hypervisor-call.patch