lkml.org 
[lkml]   [2020]   [Mar]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 63/87] net: atlantic: fix use after free kasan warn
    Date
    From: Pavel Belous <pbelous@marvell.com>

    commit a4980919ad6a7be548d499bc5338015e1a9191c6 upstream.

    skb->len is used to calculate statistics after xmit invocation.

    Under a stress load it may happen that skb will be xmited,
    rx interrupt will come and skb will be freed, all before xmit function
    is even returned.

    Eventually, skb->len will access unallocated area.

    Moving stats calculation into tx_clean routine.

    Fixes: 018423e90bee ("net: ethernet: aquantia: Add ring support code")
    Reported-by: Christophe Vu-Brugier <cvubrugier@fastmail.fm>
    Signed-off-by: Igor Russkikh <irusskikh@marvell.com>
    Signed-off-by: Pavel Belous <pbelous@marvell.com>
    Signed-off-by: Dmitry Bogdanov <dbogdanov@marvell.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/net/ethernet/aquantia/atlantic/aq_nic.c | 4 ----
    drivers/net/ethernet/aquantia/atlantic/aq_ring.c | 7 +++++--
    2 files changed, 5 insertions(+), 6 deletions(-)

    --- a/drivers/net/ethernet/aquantia/atlantic/aq_nic.c
    +++ b/drivers/net/ethernet/aquantia/atlantic/aq_nic.c
    @@ -530,10 +530,6 @@ int aq_nic_xmit(struct aq_nic_s *self, s
    if (likely(frags)) {
    err = self->aq_hw_ops->hw_ring_tx_xmit(self->aq_hw,
    ring, frags);
    - if (err >= 0) {
    - ++ring->stats.tx.packets;
    - ring->stats.tx.bytes += skb->len;
    - }
    } else {
    err = NETDEV_TX_BUSY;
    }
    --- a/drivers/net/ethernet/aquantia/atlantic/aq_ring.c
    +++ b/drivers/net/ethernet/aquantia/atlantic/aq_ring.c
    @@ -162,9 +162,12 @@ bool aq_ring_tx_clean(struct aq_ring_s *
    }
    }

    - if (unlikely(buff->is_eop))
    - dev_kfree_skb_any(buff->skb);
    + if (unlikely(buff->is_eop)) {
    + ++self->stats.rx.packets;
    + self->stats.tx.bytes += buff->skb->len;

    + dev_kfree_skb_any(buff->skb);
    + }
    buff->pa = 0U;
    buff->eop_index = 0xffffU;
    self->sw_head = aq_ring_next_dx(self, self->sw_head);

    \
     
     \ /
      Last update: 2020-03-03 19:02    [W:2.455 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site