Patch "KVM: ARM: vgic: Fix the overlap check action about setting the GICD & GICC base address." has been added to the 3.14-stable tree

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

KVM: ARM: vgic: Fix the overlap check action about setting the GICD & GICC base address.

to the 3.14-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:
kvm-arm-vgic-fix-the-overlap-check-action-about-setting-the-gicd-gicc-base-address.patch
and it can be found in the queue-3.14 subdirectory.

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

From: Haibin Wang <[email protected]>
Date: Tue, 29 Apr 2014 14:49:17 +0800
Subject: KVM: ARM: vgic: Fix the overlap check action about setting the GICD & GICC base address.

From: Haibin Wang <[email protected]>

commit 30c2117085bc4e05d091cee6eba79f069b41a9cd upstream.

Currently below check in vgic_ioaddr_overlap will always succeed, because the vgic dist base and vgic cpu base are still kept UNDEF after initialization. The code as follows will be return forever.

	if (IS_VGIC_ADDR_UNDEF(dist) || IS_VGIC_ADDR_UNDEF(cpu))
                return 0;

So, before invoking the vgic_ioaddr_overlap, it needs to set the corresponding base address firstly.

---
 virt/kvm/arm/vgic.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

@@ -1667,10 +1667,11 @@ static int vgic_ioaddr_assign(struct kvm
 	if (addr + size < addr)
 		return -EINVAL;
 
+	*ioaddr = addr;
 	ret = vgic_ioaddr_overlap(kvm);
 	if (ret)
-		return ret;
-	*ioaddr = addr;
+		*ioaddr = VGIC_ADDR_UNDEF;
+
 	return ret;
 }
 

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

queue-3.14/kvm-arm-arm64-vgic-fix-gicd_icfgr-register-accesses.patch queue-3.14/kvm-arm-vgic-fix-the-overlap-check-action-about-setting-the-gicd-gicc-base-address.patch