]> git.hungrycats.org Git - linux/commitdiff
KVM: x86/xen: Enforce 4-byte alignment of vcpu_info registration
authorDavid Woodhouse <dwmw@amazon.co.uk>
Mon, 31 Aug 2026 21:26:37 +0000 (22:26 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 6 Nov 2026 17:10:48 +0000 (12:10 -0500)
commit eacdb76c5f04956035c5d7f7e1973028f30684a2 upstream.

Xen's map_guest_area() enforces that vcpu_info is aligned to
sizeof(xen_ulong_t). KVM has no such check, allowing a guest to
register vcpu_info at an arbitrary byte alignment.

Enforce unconditional 4-byte alignment regardless of the current
shinfo mode. This is sufficient because subsequent commits ensure
that all locked atomic operations on vcpu_info fields use at most
32-bit accesses. Return -ENXIO on failure, matching Xen's
map_guest_area() behaviour for unaligned requests.

Originally observed in review of an unrelated patch:
https://lore.kernel.org/all/20260604193554.1BA311F00893@smtp.kernel.org/

Cc: stable@vger.kernel.org
Fixes: 73e69a86347a ("KVM: x86/xen: register vcpu info")
Reported-by: sashiko-bot@kernel.org
Closes: https://lore.kernel.org/all/20260604193554.1BA311F00893@smtp.kernel.org
Assisted-by: Kiro:claude-opus-4.6-1m
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
Reviewed-by: Paul Durrant <paul@xen.org>
Link: https://patch.msgid.link/20260831213632.81023-7-dwmw2@infradead.org
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
arch/x86/kvm/xen.c

index d113bd0f1c3d230c2e67a8fe30e40ad03e5f995e..4e3ec7d57a6673c06bea51fb2480ba1ebc5aaecd 100644 (file)
@@ -941,6 +941,10 @@ int kvm_xen_vcpu_set_attr(struct kvm_vcpu *vcpu, struct kvm_xen_vcpu_attr *data)
                                break;
                        }
 
+                       r = -ENXIO;
+                       if (!IS_ALIGNED(data->u.gpa, sizeof(u32)))
+                               break;
+
                        r = kvm_gpc_activate(&vcpu->arch.xen.vcpu_info_cache,
                                             data->u.gpa, sizeof(struct vcpu_info));
                } else {
@@ -950,6 +954,10 @@ int kvm_xen_vcpu_set_attr(struct kvm_vcpu *vcpu, struct kvm_xen_vcpu_attr *data)
                                break;
                        }
 
+                       r = -ENXIO;
+                       if (!IS_ALIGNED(data->u.hva, sizeof(u32)))
+                               break;
+
                        r = kvm_gpc_activate_hva(&vcpu->arch.xen.vcpu_info_cache,
                                                 data->u.hva, sizeof(struct vcpu_info));
                }