diff options
| author | Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> | 2013-10-02 12:57:21 +0200 |
|---|---|---|
| committer | Luis Henriques <luis.henriques@canonical.com> | 2013-10-25 10:41:31 +0100 |
| commit | f8a89963ee19036e5771f600558e70789edab352 (patch) | |
| tree | f6a49e24c1b8e8c958bb63ae4dcb5350167706ed | |
| parent | cf6cde9167d4a18b9a72b80449fb57c947ed8d10 (diff) | |
net: mv643xx_eth: fix orphaned statistics timer crash
commit f564412c935111c583b787bcc18157377b208e2e upstream.
The periodic statistics timer gets started at port _probe() time, but
is stopped on _stop() only. In a modular environment, this can cause
the timer to access already deallocated memory, if the module is unloaded
without starting the eth device. To fix this, we add the timer right
before the port is started, instead of at _probe() time.
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Acked-by: Jason Cooper <jason@lakedaemon.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
| -rw-r--r-- | drivers/net/ethernet/marvell/mv643xx_eth.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/marvell/mv643xx_eth.c b/drivers/net/ethernet/marvell/mv643xx_eth.c index ae50dd67df32..02b03b56ec02 100644 --- a/drivers/net/ethernet/marvell/mv643xx_eth.c +++ b/drivers/net/ethernet/marvell/mv643xx_eth.c @@ -2366,6 +2366,7 @@ static int mv643xx_eth_open(struct net_device *dev) mp->int_mask |= INT_TX_END_0 << i; } + add_timer(&mp->mib_counters_timer); port_start(mp); wrlp(mp, INT_MASK_EXT, INT_EXT_LINK_PHY | INT_EXT_TX); @@ -2913,7 +2914,6 @@ static int mv643xx_eth_probe(struct platform_device *pdev) mp->mib_counters_timer.data = (unsigned long)mp; mp->mib_counters_timer.function = mib_counters_timer_wrapper; mp->mib_counters_timer.expires = jiffies + 30 * HZ; - add_timer(&mp->mib_counters_timer); spin_lock_init(&mp->mib_counters_lock); |