From: Chad Dupuis <cdupuis@redhat.com> Date: Tue, 20 Jul 2010 15:31:47 -0400 Subject: [net] qlcnic: protect resoruce cleanup by rtnl lock Message-id: <20100720153053.2978.99161.sendpatchset@localhost.localdomain> Patchwork-id: 26964 O-Subject: [RHEL 5.6 PATCH 5/16] qlcnic: protect resoruce cleanup by rtnl lock Bugzilla: 562723 RH-Acked-by: David S. Miller <davem@redhat.com> Bugzilla ======== 562723 Upstream Status =============== net-2.6 commit id ce6684433fb277406dd861fd8a17133253e7c367 Description =========== >From bc1c6cb65f7bdd2c169e307f0e18f6d341db1e92 Mon Sep 17 00:00:00 2001 From: Amit Kumar Salecha <amit.salecha@qlogic.com> Date: Mon, 1 Feb 2010 05:24:57 +0000 Subject: [PATCH] qlcnic: protect resoruce cleanup by rtnl lock o context resources can be in used, while resoruce cleanup is in progress, during fw recover. o Null pointer execption can occur in send_cmd_desc, if fw recovery module frees tx ring without rtnl lock. o Same applies to ethtool register dump and FW health registers should be dump in any case. Signed-off-by: Amit Kumar Salecha <amit.salecha@qlogic.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Jarod Wilson <jarod@redhat.com> diff --git a/drivers/net/qlcnic/qlcnic_ethtool.c b/drivers/net/qlcnic/qlcnic_ethtool.c index cffc329..849ac83 100644 --- a/drivers/net/qlcnic/qlcnic_ethtool.c +++ b/drivers/net/qlcnic/qlcnic_ethtool.c @@ -326,12 +326,12 @@ qlcnic_get_regs(struct net_device *dev, struct ethtool_regs *regs, void *p) regs->version = (1 << 24) | (adapter->ahw.revision_id << 16) | (adapter->pdev)->device; - if (adapter->is_up != QLCNIC_ADAPTER_UP_MAGIC) - return; - for (i = 0; diag_registers[i] != -1; i++) regs_buff[i] = QLCRD32(adapter, diag_registers[i]); + if (adapter->is_up != QLCNIC_ADAPTER_UP_MAGIC) + return; + regs_buff[i++] = 0xFFEFCDAB; /* Marker btw regs and ring count*/ regs_buff[i++] = 1; /* No. of tx ring */ diff --git a/drivers/net/qlcnic/qlcnic_main.c b/drivers/net/qlcnic/qlcnic_main.c index 3f0edb3..d04b2d5 100644 --- a/drivers/net/qlcnic/qlcnic_main.c +++ b/drivers/net/qlcnic/qlcnic_main.c @@ -2064,7 +2064,9 @@ qlcnic_detach_work(void *data) qlcnic_down(adapter, netdev); + rtnl_lock(); qlcnic_detach(adapter); + rtnl_unlock(); status = QLCRD32(adapter, QLCNIC_PEG_HALT_STATUS1);