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, 13 Aug 2013 14:25:21 +0200 From: Sebastian Hesselbarth <sebastian.hesselbarth@...il.com> To: Sebastian Hesselbarth <sebastian.hesselbarth@...il.com> Cc: Russell King <linux@....linux.org.uk>, Jason Cooper <jason@...edaemon.net>, Andrew Lunn <andrew@...n.ch>, Bjorn Helgaas <bhelgaas@...gle.com>, Thomas Petazzoni <thomas.petazzoni@...e-electrons.com>, linux-kernel@...r.kernel.org, linux-arm-kernel@...ts.infradead.org, linux-pci@...r.kernel.org Subject: [PATCH v2 2/5] PCI: mvebu: increment nports only for registered ports The number of ports is probed by counting the number of available child nodes. Later on, the registration of a port can fail and cause a mismatch between the ->nports counter and registered ports. This patch modifies the counting strategy, to make ->nports represent the number of registered ports instead of the number of available childs. Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@...il.com> --- Changelog: v1->v2: - also use 'i' as iterator during port parsing and assign at the end of probing (Reported by Thomas Pettazoni) Cc: Russell King <linux@....linux.org.uk> Cc: Jason Cooper <jason@...edaemon.net> Cc: Andrew Lunn <andrew@...n.ch> Cc: Bjorn Helgaas <bhelgaas@...gle.com> Cc: Thomas Petazzoni <thomas.petazzoni@...e-electrons.com> Cc: linux-kernel@...r.kernel.org Cc: linux-arm-kernel@...ts.infradead.org Cc: linux-pci@...r.kernel.org --- drivers/pci/host/pci-mvebu.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/pci/host/pci-mvebu.c b/drivers/pci/host/pci-mvebu.c index 1533fda..d2e9ae7 100644 --- a/drivers/pci/host/pci-mvebu.c +++ b/drivers/pci/host/pci-mvebu.c @@ -842,13 +842,14 @@ static int __init mvebu_pcie_probe(struct platform_device *pdev) return ret; } + i = 0; for_each_child_of_node(pdev->dev.of_node, child) { if (!of_device_is_available(child)) continue; - pcie->nports++; + i++; } - pcie->ports = devm_kzalloc(&pdev->dev, pcie->nports * + pcie->ports = devm_kzalloc(&pdev->dev, i * sizeof(struct mvebu_pcie_port), GFP_KERNEL); if (!pcie->ports) @@ -934,8 +935,8 @@ static int __init mvebu_pcie_probe(struct platform_device *pdev) i++; } + pcie->nports = i; mvebu_pcie_msi_enable(pcie); - mvebu_pcie_enable(pcie); return 0; -- 1.7.10.4 -- 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