From 88a53f46e2032ef6ef6cf05e1f4ea96040d9202e Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 26 Feb 2024 17:04:29 +0100 Subject: [PATCH] 6.6-stable patches added patches: xen-events-fix-error-code-in-xen_bind_pirq_msi_to_irq.patch --- queue-6.6/series | 1 + ...ror-code-in-xen_bind_pirq_msi_to_irq.patch | 36 +++++++++++++++++++ 2 files changed, 37 insertions(+) create mode 100644 queue-6.6/xen-events-fix-error-code-in-xen_bind_pirq_msi_to_irq.patch diff --git a/queue-6.6/series b/queue-6.6/series index eccd42d80cc..69218bf8612 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -206,3 +206,4 @@ smb3-add-missing-null-server-pointer-check.patch drm-amd-display-avoid-enum-conversion-warning.patch drm-amd-display-fix-buffer-overflow-in-get_host_router_total_dp_tunnel_bw.patch revert-drm-amd-display-increased-min_dcfclk_mhz-and-min_fclk_mhz.patch +xen-events-fix-error-code-in-xen_bind_pirq_msi_to_irq.patch diff --git a/queue-6.6/xen-events-fix-error-code-in-xen_bind_pirq_msi_to_irq.patch b/queue-6.6/xen-events-fix-error-code-in-xen_bind_pirq_msi_to_irq.patch new file mode 100644 index 00000000000..556364fa26b --- /dev/null +++ b/queue-6.6/xen-events-fix-error-code-in-xen_bind_pirq_msi_to_irq.patch @@ -0,0 +1,36 @@ +From 7f3da4b698bcc21a6df0e7f114af71d53a3e26ac Mon Sep 17 00:00:00 2001 +From: Dan Carpenter +Date: Tue, 28 Nov 2023 09:52:41 +0300 +Subject: xen/events: fix error code in xen_bind_pirq_msi_to_irq() + +From: Dan Carpenter + +commit 7f3da4b698bcc21a6df0e7f114af71d53a3e26ac upstream. + +Return -ENOMEM if xen_irq_init() fails. currently the code returns an +uninitialized variable or zero. + +Fixes: 5dd9ad32d775 ("xen/events: drop xen_allocate_irqs_dynamic()") +Signed-off-by: Dan Carpenter +Reviewed-by: Juergen Gross +Link: https://lore.kernel.org/r/3b9ab040-a92e-4e35-b687-3a95890a9ace@moroto.mountain +Signed-off-by: Juergen Gross +Signed-off-by: Greg Kroah-Hartman +--- + drivers/xen/events/events_base.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +--- a/drivers/xen/events/events_base.c ++++ b/drivers/xen/events/events_base.c +@@ -1099,8 +1099,10 @@ int xen_bind_pirq_msi_to_irq(struct pci_ + + for (i = 0; i < nvec; i++) { + info = xen_irq_init(irq + i); +- if (!info) ++ if (!info) { ++ ret = -ENOMEM; + goto error_irq; ++ } + + irq_set_chip_and_handler_name(irq + i, &xen_pirq_chip, handle_edge_irq, name); + -- 2.47.2