lkml.org 
[lkml]   [2014]   [Jan]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.12 29/77] arc_emac: fix potential use after free
    Date
    3.12-stable review patch.  If anyone has any objections, please let me know.

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

    From: Eric Dumazet <eric.dumazet@gmail.com>

    [ Upstream commit 37ec274e9713eafc2ba6c4471420f06cb8f68ecf ]

    Signed-off-by: Eric Dumazet <edumazet@google.com>

    skb_tx_timestamp(skb) should be called _before_ TX completion
    has a chance to trigger, otherwise it is too late and we access
    freed memory.

    Fixes: e4f2379db6c6 ("ethernet/arc/arc_emac - Add new driver")
    From: Eric Dumazet <edumazet@google.com>
    Cc: Alexey Brodkin <Alexey.Brodkin@synopsys.com>
    Cc: Richard Cochran <richardcochran@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/net/ethernet/arc/emac_main.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    --- a/drivers/net/ethernet/arc/emac_main.c
    +++ b/drivers/net/ethernet/arc/emac_main.c
    @@ -565,6 +565,8 @@ static int arc_emac_tx(struct sk_buff *s
    /* Make sure pointer to data buffer is set */
    wmb();

    + skb_tx_timestamp(skb);
    +
    *info = cpu_to_le32(FOR_EMAC | FIRST_OR_LAST_MASK | len);

    /* Increment index to point to the next BD */
    @@ -579,8 +581,6 @@ static int arc_emac_tx(struct sk_buff *s

    arc_reg_set(priv, R_STATUS, TXPL_MASK);

    - skb_tx_timestamp(skb);
    -
    return NETDEV_TX_OK;
    }




    \
     
     \ /
      Last update: 2014-01-14 08:41    [W:4.126 / U:0.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site