lkml.org 
[lkml]   [2019]   [Dec]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.4 233/350] ice: Check for null pointer dereference when setting rings
    Date
    From: Michal Swiatkowski <michal.swiatkowski@intel.com>

    [ Upstream commit eb0ee8abfeb9ff4b98e8e40217b8667bfb08587a ]

    Without this check rebuild vsi can lead to kernel panic.

    Signed-off-by: Michal Swiatkowski <michal.swiatkowski@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 <sashal@kernel.org>
    ---
    drivers/net/ethernet/intel/ice/ice_main.c | 18 ++++++++++++++----
    1 file changed, 14 insertions(+), 4 deletions(-)

    diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c
    index 214cd6eca405d..2408f0de95fc2 100644
    --- a/drivers/net/ethernet/intel/ice/ice_main.c
    +++ b/drivers/net/ethernet/intel/ice/ice_main.c
    @@ -3970,8 +3970,13 @@ int ice_vsi_setup_tx_rings(struct ice_vsi *vsi)
    }

    ice_for_each_txq(vsi, i) {
    - vsi->tx_rings[i]->netdev = vsi->netdev;
    - err = ice_setup_tx_ring(vsi->tx_rings[i]);
    + struct ice_ring *ring = vsi->tx_rings[i];
    +
    + if (!ring)
    + return -EINVAL;
    +
    + ring->netdev = vsi->netdev;
    + err = ice_setup_tx_ring(ring);
    if (err)
    break;
    }
    @@ -3996,8 +4001,13 @@ int ice_vsi_setup_rx_rings(struct ice_vsi *vsi)
    }

    ice_for_each_rxq(vsi, i) {
    - vsi->rx_rings[i]->netdev = vsi->netdev;
    - err = ice_setup_rx_ring(vsi->rx_rings[i]);
    + struct ice_ring *ring = vsi->rx_rings[i];
    +
    + if (!ring)
    + return -EINVAL;
    +
    + ring->netdev = vsi->netdev;
    + err = ice_setup_rx_ring(ring);
    if (err)
    break;
    }
    --
    2.20.1
    \
     
     \ /
      Last update: 2019-12-10 22:23    [W:2.870 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site