lkml.org 
[lkml]   [2018]   [Mar]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL for 4.9 072/219] i40e/i40evf: Fix use after free in Rx cleanup path
    Date
    From: Alexander Duyck <alexander.h.duyck@intel.com>

    [ Upstream commit 741b8b832a57402380be79d7d11a59eaf57fff3b ]

    We need to reset skb back to NULL when we have freed it in the Rx cleanup
    path. I found one spot where this wasn't occurring so this patch fixes it.

    Change-ID: Iaca68934200732cd4a63eb0bd83b539c95f8c4dd
    Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
    Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
    Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    ---
    drivers/net/ethernet/intel/i40e/i40e_txrx.c | 1 +
    drivers/net/ethernet/intel/i40evf/i40e_txrx.c | 1 +
    2 files changed, 2 insertions(+)

    diff --git a/drivers/net/ethernet/intel/i40e/i40e_txrx.c b/drivers/net/ethernet/intel/i40e/i40e_txrx.c
    index c5430394fac9..45b307d1858b 100644
    --- a/drivers/net/ethernet/intel/i40e/i40e_txrx.c
    +++ b/drivers/net/ethernet/intel/i40e/i40e_txrx.c
    @@ -1820,6 +1820,7 @@ static int i40e_clean_rx_irq(struct i40e_ring *rx_ring, int budget)
    */
    if (unlikely(i40e_test_staterr(rx_desc, BIT(I40E_RXD_QW1_ERROR_SHIFT)))) {
    dev_kfree_skb_any(skb);
    + skb = NULL;
    continue;
    }

    diff --git a/drivers/net/ethernet/intel/i40evf/i40e_txrx.c b/drivers/net/ethernet/intel/i40evf/i40e_txrx.c
    index c03800d1000a..a951477a68b8 100644
    --- a/drivers/net/ethernet/intel/i40evf/i40e_txrx.c
    +++ b/drivers/net/ethernet/intel/i40evf/i40e_txrx.c
    @@ -1262,6 +1262,7 @@ static int i40e_clean_rx_irq(struct i40e_ring *rx_ring, int budget)
    */
    if (unlikely(i40e_test_staterr(rx_desc, BIT(I40E_RXD_QW1_ERROR_SHIFT)))) {
    dev_kfree_skb_any(skb);
    + skb = NULL;
    continue;
    }

    --
    2.14.1
    \
     
     \ /
      Last update: 2018-03-04 00:55    [W:2.121 / U:0.348 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site