lkml.org 
[lkml]   [2018]   [Oct]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.18 204/228] e1000: check on netif_running() before calling e1000_up()
    Date
    4.18-stable review patch.  If anyone has any objections, please let me know.

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

    From: Bo Chen <chenbo@pdx.edu>

    [ Upstream commit cf1acec008f8d7761aa3fd7c4bca7e17b2d2512d ]

    When the device is not up, the call to 'e1000_up()' from the error handling path
    of 'e1000_set_ringparam()' causes a kernel oops with a null-pointer
    dereference. The null-pointer dereference is triggered in function
    'e1000_alloc_rx_buffers()' at line 'buffer_info = &rx_ring->buffer_info[i]'.

    This bug was reported by COD, a tool for testing kernel module binaries I am
    building. This bug was also detected by KFI from Dr. Kai Cong.

    This patch fixes the bug by checking on 'netif_running()' before calling
    'e1000_up()' in 'e1000_set_ringparam()'.

    Signed-off-by: Bo Chen <chenbo@pdx.edu>
    Acked-by: Alexander Duyck <alexander.h.duyck@intel.com>
    Tested-by: Aaron Brown <aaron.f.brown@intel.com>
    Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/net/ethernet/intel/e1000/e1000_ethtool.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    --- a/drivers/net/ethernet/intel/e1000/e1000_ethtool.c
    +++ b/drivers/net/ethernet/intel/e1000/e1000_ethtool.c
    @@ -644,7 +644,8 @@ err_setup_rx:
    err_alloc_rx:
    kfree(txdr);
    err_alloc_tx:
    - e1000_up(adapter);
    + if (netif_running(adapter->netdev))
    + e1000_up(adapter);
    err_setup:
    clear_bit(__E1000_RESETTING, &adapter->flags);
    return err;

    \
     
     \ /
      Last update: 2018-10-02 15:59    [W:2.252 / U:0.068 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site