lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Tue, 26 Nov 2013 10:09:54 +0100 From: Alexander Gordeev <agordeev@...hat.com> To: linux-kernel@...r.kernel.org Cc: Alexander Gordeev <agordeev@...hat.com>, Bjorn Helgaas <bhelgaas@...gle.com>, Michael Ellerman <michael@...erman.id.au>, Benjamin Herrenschmidt <benh@...nel.crashing.org>, Tejun Heo <tj@...nel.org>, Ben Hutchings <bhutchings@...arflare.com>, David Laight <David.Laight@...LAB.COM>, Mark Lord <kernel@...rt.ca>, "H. Peter Anvin" <hpa@...or.com>, linux-pci@...r.kernel.org Subject: [PATCH v3 05/11] PCI/MSI: Fix return value when populate_msi_sysfs() failed If populate_msi_sysfs() function failed msix_capability_init() must return the error code, but it returns the success instead. This update fixes the described misbehaviour. Signed-off-by: Alexander Gordeev <agordeev@...hat.com> Reviewed-by: Tejun Heo <tj@...nel.org> --- drivers/pci/msi.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c index 5e63645..babe503 100644 --- a/drivers/pci/msi.c +++ b/drivers/pci/msi.c @@ -729,7 +729,7 @@ static int msix_capability_init(struct pci_dev *dev, ret = arch_setup_msi_irqs(dev, nvec, PCI_CAP_ID_MSIX); if (ret) - goto error; + goto out_avail; /* * Some devices require MSI-X to be enabled before we can touch the @@ -742,10 +742,8 @@ static int msix_capability_init(struct pci_dev *dev, msix_program_entries(dev, entries); ret = populate_msi_sysfs(dev); - if (ret) { - ret = 0; - goto error; - } + if (ret) + goto out_free; /* Set MSI-X enabled bits and unmask the function */ pci_intx_for_msi(dev, 0); @@ -756,7 +754,7 @@ static int msix_capability_init(struct pci_dev *dev, return 0; -error: +out_avail: if (ret < 0) { /* * If we had some success, report the number of irqs @@ -773,6 +771,7 @@ error: ret = avail; } +out_free: free_msi_irqs(dev); return ret; -- 1.7.7.6 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists