lkml.org 
[lkml]   [2013]   [Nov]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.10 10/54] net: mv643xx_eth: fix orphaned statistics timer crash
    Date
    3.10-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>

    [ Upstream commit f564412c935111c583b787bcc18157377b208e2e ]

    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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/net/ethernet/marvell/mv643xx_eth.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/drivers/net/ethernet/marvell/mv643xx_eth.c
    +++ b/drivers/net/ethernet/marvell/mv643xx_eth.c
    @@ -2229,6 +2229,7 @@ static int mv643xx_eth_open(struct net_d
    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);
    @@ -2737,7 +2738,6 @@ static int mv643xx_eth_probe(struct plat
    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);




    \
     
     \ /
      Last update: 2013-11-01 23:21    [W:4.126 / U:0.276 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site