From: Andrew Cooper <andrew.cooper3@citrix.com>
Date: Tue, 22 Mar 2022 12:07:24 +0000 (+0100)
Subject: x86/hvm: Annotate hvm_physdev_op() with cf_check
X-Git-Tag: archive/raspbian/4.17.0-1+rpi1^2~33^2~815
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=b68664ab8954fd6aecbc579fc7444aa6e07f5581;p=xen.git

x86/hvm: Annotate hvm_physdev_op() with cf_check

This was missed previously, and would yield a fatal #CP for any HVM domain
which issues a physdevop hypercall.

Fixes: cdbe2b0a1aec ("x86: Enable CET Indirect Branch Tracking")
Reported-by: Juergen Gross <jgross@suse.com>
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Reviewed-by: Jan Beulich <jbeulich@suse.com>
---

diff --git a/xen/arch/x86/hvm/hypercall.c b/xen/arch/x86/hvm/hypercall.c
index 030243810e..62b5349e7d 100644
--- a/xen/arch/x86/hvm/hypercall.c
+++ b/xen/arch/x86/hvm/hypercall.c
@@ -78,7 +78,7 @@ static long cf_check hvm_grant_table_op(
 }
 #endif
 
-static long hvm_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg)
+static long cf_check hvm_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg)
 {
     const struct vcpu *curr = current;
     const struct domain *currd = curr->domain;