Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f564412c authored by Sebastian Hesselbarth's avatar Sebastian Hesselbarth Committed by David S. Miller
Browse files

net: mv643xx_eth: fix orphaned statistics timer crash 



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: default avatarSebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Acked-by: default avatarJason Cooper <jason@lakedaemon.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 041b4ddb

drivers/net/ethernet/marvell/mv643xx_eth.c

+1 −1
Original line number Diff line number Diff line
@@ -2235,6 +2235,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);
@@ -2914,7 +2915,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);