public inbox for stable@vger.kernel.org
 help / color / mirror / Atom feed
From: Amit Shah <aams@amazon.com>
To: <xen-devel@lists.xenproject.org>
Cc: linux-kernel@vger.kernel.org, "Amit Shah" <aams@amazon.com>,
	stable@vger.kernel.org, "Roger Pau Monné" <roger.pau@citrix.com>,
	"Boris Ostrovsky" <boris.ostrovsky@oracle.com>,
	"Eduardo Valentin" <eduval@amazon.com>,
	"Juergen Gross" <jgross@suse.com>,
	"Thomas Gleixner" <tglx@linutronix.de>,
	"K. Y. Srinivasan" <kys@microsoft.com>,
	"Liu Shuo" <shuo.a.liu@intel.com>,
	"Anoob Soman" <anoob.soman@citrix.com>
Subject: [PATCH v2 2/2] xen: events: free irqs in error condition
Date: Tue, 27 Feb 2018 15:55:58 +0000	[thread overview]
Message-ID: <1519746958-52077-3-git-send-email-aams@amazon.com> (raw)
In-Reply-To: <1519746958-52077-1-git-send-email-aams@amazon.com>

In case of errors in irq setup for MSI, free up the allocated irqs.

Fixes: 4892c9b4ada9f9 ("xen: add support for MSI message groups")
Reported-by: Hooman Mirhadi <mirhadih@amazon.com>
CC: <stable@vger.kernel.org>
CC: Roger Pau Monné <roger.pau@citrix.com>
CC: Boris Ostrovsky <boris.ostrovsky@oracle.com>
CC: Eduardo Valentin <eduval@amazon.com>
CC: Juergen Gross <jgross@suse.com>
CC: Thomas Gleixner <tglx@linutronix.de>
CC: "K. Y. Srinivasan" <kys@microsoft.com>
CC: Liu Shuo <shuo.a.liu@intel.com>
CC: Anoob Soman <anoob.soman@citrix.com>
Signed-off-by: Amit Shah <aams@amazon.com>
---
 drivers/xen/events/events_base.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/xen/events/events_base.c b/drivers/xen/events/events_base.c
index c86d10e..a299586 100644
--- a/drivers/xen/events/events_base.c
+++ b/drivers/xen/events/events_base.c
@@ -750,11 +750,14 @@ int xen_bind_pirq_msi_to_irq(struct pci_dev *dev, struct msi_desc *msidesc,
 
 	ret = irq_set_msi_desc(irq, msidesc);
 	if (ret < 0)
-		goto error_irq;
+		goto error_desc;
 out:
 	mutex_unlock(&irq_mapping_update_lock);
 	return irq;
 error_irq:
+	while (--nvec >= i)
+		xen_free_irq(irq + nvec);
+error_desc:
 	while (i > 0) {
 		i--;
 		__unbind_from_irq(irq + i);
-- 
2.7.3.AMZN

Amazon Development Center Germany GmbH
Berlin - Dresden - Aachen
main office: Krausenstr. 38, 10117 Berlin
Geschaeftsfuehrer: Dr. Ralf Herbrich, Christian Schlaeger
Ust-ID: DE289237879
Eingetragen am Amtsgericht Charlottenburg HRB 149173 B

  parent reply	other threads:[~2018-02-27 15:56 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <1519746958-52077-1-git-send-email-aams@amazon.com>
2018-02-27 15:55 ` [PATCH v2 1/2] xen: fix out-of-bounds irq unbind for MSI message groups Amit Shah
2018-02-27 16:58   ` Roger Pau Monné
2018-02-27 15:55 ` Amit Shah [this message]
2018-02-27 17:07   ` [PATCH v2 2/2] xen: events: free irqs in error condition Roger Pau Monné
     [not found]     ` <1519752774.4965.23.camel@amazon.com>
2018-02-28  8:16       ` Roger Pau Monné
     [not found]         ` <1519806324.4965.25.camel@amazon.com>
2018-02-28  8:27           ` Juergen Gross

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1519746958-52077-3-git-send-email-aams@amazon.com \
    --to=aams@amazon.com \
    --cc=anoob.soman@citrix.com \
    --cc=boris.ostrovsky@oracle.com \
    --cc=eduval@amazon.com \
    --cc=jgross@suse.com \
    --cc=kys@microsoft.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=roger.pau@citrix.com \
    --cc=shuo.a.liu@intel.com \
    --cc=stable@vger.kernel.org \
    --cc=tglx@linutronix.de \
    --cc=xen-devel@lists.xenproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox