lkml.org 
[lkml]   [2018]   [May]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 107/496] ibmvnic: Check for NULL skbs in NAPI poll routine
    Date
    4.14-stable review patch.  If anyone has any objections, please let me know.

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

    From: Thomas Falcon <tlfalcon@linux.vnet.ibm.com>

    [ Upstream commit abe27a885d9e6575e663a16176dabc58ce9d7188 ]

    After introduction of commit d0869c0071e4, there were some instances of
    RX queue entries from a previous session (before the device was closed
    and reopened) returned to the NAPI polling routine. Since the corresponding
    socket buffers were freed, this resulted in a panic on reopen. Include
    a check for a NULL skb here to avoid this.

    Fixes: d0869c0071e4 ("ibmvnic: Clean RX pool buffers during device close")
    Signed-off-by: Thomas Falcon <tlfalcon@linux.vnet.ibm.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/net/ethernet/ibm/ibmvnic.c | 5 +++++
    1 file changed, 5 insertions(+)

    --- a/drivers/net/ethernet/ibm/ibmvnic.c
    +++ b/drivers/net/ethernet/ibm/ibmvnic.c
    @@ -1668,6 +1668,11 @@ restart_poll:
    dev_kfree_skb_any(rx_buff->skb);
    remove_buff_from_pool(adapter, rx_buff);
    continue;
    + } else if (!rx_buff->skb) {
    + /* free the entry */
    + next->rx_comp.first = 0;
    + remove_buff_from_pool(adapter, rx_buff);
    + continue;
    }

    length = be32_to_cpu(next->rx_comp.len);

    \
     
     \ /
      Last update: 2018-05-28 15:28    [W:4.166 / U:0.120 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site