]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
xen/events: Cleanup find_virq() return codes
authorJason Andryuk <jason.andryuk@amd.com>
Thu, 28 Aug 2025 00:36:01 +0000 (20:36 -0400)
committerJuergen Gross <jgross@suse.com>
Tue, 9 Sep 2025 07:09:30 +0000 (09:09 +0200)
rc is overwritten by the evtchn_status hypercall in each iteration, so
the return value will be whatever the last iteration is.  This could
incorrectly return success even if the event channel was not found.
Change to an explicit -ENOENT for an un-found virq and return 0 on a
successful match.

Fixes: 62cc5fc7b2e0 ("xen/pv-on-hvm kexec: rebind virqs to existing eventchannel ports")
Cc: stable@vger.kernel.org
Signed-off-by: Jason Andryuk <jason.andryuk@amd.com>
Reviewed-by: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Juergen Gross <jgross@suse.com>
Signed-off-by: Juergen Gross <jgross@suse.com>
Message-ID: <20250828003604.8949-2-jason.andryuk@amd.com>

drivers/xen/events/events_base.c

index 41309d38f78c3cbd87894776b55571a4e2aa07c3..374231d84e4f7758556cf92cb45a454e373c60f7 100644 (file)
@@ -1318,10 +1318,11 @@ static int find_virq(unsigned int virq, unsigned int cpu, evtchn_port_t *evtchn)
 {
        struct evtchn_status status;
        evtchn_port_t port;
-       int rc = -ENOENT;
 
        memset(&status, 0, sizeof(status));
        for (port = 0; port < xen_evtchn_max_channels(); port++) {
+               int rc;
+
                status.dom = DOMID_SELF;
                status.port = port;
                rc = HYPERVISOR_event_channel_op(EVTCHNOP_status, &status);
@@ -1331,10 +1332,10 @@ static int find_virq(unsigned int virq, unsigned int cpu, evtchn_port_t *evtchn)
                        continue;
                if (status.u.virq == virq && status.vcpu == xen_vcpu_nr(cpu)) {
                        *evtchn = port;
-                       break;
+                       return 0;
                }
        }
-       return rc;
+       return -ENOENT;
 }
 
 /**