malhuda/msm-4.14
1
0
Fork 0
mirror of https://github.com/rd-stuffs/msm-4.14.git synced 2025-02-20 11:45:48 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

qlcnic: fix memory leak in qlcnic_blink_led.

Browse Source 
o Memory allocated in ETHTOOL_ACTIVE mode, is not getting freed. So,
  in ETHTOOL_ID_INACTIVE mode, return after freeing allocated memory.
o Using set bit instead of blink_down field, as it is also required
  in internal Loopback test and etc.

Signed-off-by: Sucheta Chakraborty <sucheta.chakraborty@qlogic.com>
Signed-off-by: Amit Kumar Salecha <amit.salecha@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Sucheta Chakraborty 2011-04-27 14:43:44 +00:00 committed by David S. Miller
parent 63c3a66fe6
commit 89b4208e28
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/qlcnic/qlcnic.h
View File

@ -884,6 +884,7 @@ struct qlcnic_ipaddr {
#define __QLCNIC_RESETTING 2 #define __QLCNIC_RESETTING 2
#define __QLCNIC_START_FW 4 #define __QLCNIC_START_FW 4
#define __QLCNIC_AER 5 #define __QLCNIC_AER 5
#define __QLCNIC_DIAG_RES_ALLOC 6
#define QLCNIC_INTERRUPT_TEST 1 #define QLCNIC_INTERRUPT_TEST 1
#define QLCNIC_LOOPBACK_TEST 2 #define QLCNIC_LOOPBACK_TEST 2
@ -913,7 +914,6 @@ struct qlcnic_adapter {
struct net_device *netdev; struct net_device *netdev;
struct pci_dev *pdev; struct pci_dev *pdev;
bool blink_was_down;
unsigned long state; unsigned long state;
u32 flags; u32 flags;

12
drivers/net/qlcnic/qlcnic_ethtool.c
View File

@ -772,7 +772,6 @@ static int qlcnic_set_led(struct net_device *dev,
switch (state) { switch (state) {
case ETHTOOL_ID_ACTIVE: case ETHTOOL_ID_ACTIVE:
adapter->blink_was_down = false;
if (!test_bit(__QLCNIC_DEV_UP, &adapter->state)) { if (!test_bit(__QLCNIC_DEV_UP, &adapter->state)) {
if (test_and_set_bit(__QLCNIC_RESETTING, &adapter->state)) if (test_and_set_bit(__QLCNIC_RESETTING, &adapter->state))
return -EIO; return -EIO;
@ -781,7 +780,7 @@ static int qlcnic_set_led(struct net_device *dev,
clear_bit(__QLCNIC_RESETTING, &adapter->state); clear_bit(__QLCNIC_RESETTING, &adapter->state);
return -EIO; return -EIO;
} }
adapter->blink_was_down = true; set_bit(__QLCNIC_DIAG_RES_ALLOC, &adapter->state);
} }
if (adapter->nic_ops->config_led(adapter, 1, 0xf) == 0) if (adapter->nic_ops->config_led(adapter, 1, 0xf) == 0)
@ -792,18 +791,17 @@ static int qlcnic_set_led(struct net_device *dev,
break; break;
case ETHTOOL_ID_INACTIVE: case ETHTOOL_ID_INACTIVE:
if (adapter->nic_ops->config_led(adapter, 0, 0xf) == 0) if (adapter->nic_ops->config_led(adapter, 0, 0xf))
return 0; dev_err(&adapter->pdev->dev,
"Failed to reset LED blink state.\n");
dev_err(&adapter->pdev->dev,
"Failed to reset LED blink state.\n");
break; break;
default: default:
return -EINVAL; return -EINVAL;
} }
if (adapter->blink_was_down) { if (test_and_clear_bit(__QLCNIC_DIAG_RES_ALLOC, &adapter->state)) {
qlcnic_diag_free_res(dev, max_sds_rings); qlcnic_diag_free_res(dev, max_sds_rings);
clear_bit(__QLCNIC_RESETTING, &adapter->state); clear_bit(__QLCNIC_RESETTING, &adapter->state);
} }