Skip to content

Commit

Permalink
qlcnic: protect resoruce cleanup by rtnl lock
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Amit Kumar Salecha authored and David S. Miller committed Feb 2, 2010
1 parent 1b95a83 commit ce66844
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/net/qlcnic/qlcnic_ethtool.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
2 changes: 2 additions & 0 deletions drivers/net/qlcnic/qlcnic_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -2051,7 +2051,9 @@ qlcnic_detach_work(struct work_struct *work)

qlcnic_down(adapter, netdev);

rtnl_lock();
qlcnic_detach(adapter);
rtnl_unlock();

status = QLCRD32(adapter, QLCNIC_PEG_HALT_STATUS1);

Expand Down

0 comments on commit ce66844

Please sign in to comment.