Commit 08df2d7d authored by Jason Andryuk's avatar Jason Andryuk Committed by Juergen Gross
Browse files

xen/events: Cleanup find_virq() return codes 



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: 62cc5fc7 ("xen/pv-on-hvm kexec: rebind virqs to existing eventchannel ports")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarJason Andryuk <jason.andryuk@amd.com>
Reviewed-by: default avatarJan Beulich <jbeulich@suse.com>
Reviewed-by: default avatarJuergen Gross <jgross@suse.com>
Signed-off-by: default avatarJuergen Gross <jgross@suse.com>
Message-ID: <20250828003604.8949-2-jason.andryuk@amd.com>
parent 29c2f18d

drivers/xen/events/events_base.c

+4 −3
Original line number Diff line number Diff line
@@ -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;

}



/**