OSDN Git Service

ice: Check for q_vector when stopping rings
authorTony Nguyen <anthony.l.nguyen@intel.com>
Fri, 26 Oct 2018 17:41:01 +0000 (10:41 -0700)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Tue, 13 Nov 2018 17:09:25 +0000 (09:09 -0800)
There is a gap in time between a VF reset, which sets the q_vector to
NULL, and the VF requesting mapping of the q_vectors. If
ice_vsi_stop_tx_rings() is called during this time, a NULL pointer
dereference is encountered. Add a check in ice_vsi_stop_tx_rings()
to ensure the q_vector is set to avoid this situation from occurring.

Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
Signed-off-by: Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
drivers/net/ethernet/intel/ice/ice_lib.c

index 1041fa2..11d0ab1 100644 (file)
@@ -1908,7 +1908,8 @@ int ice_vsi_stop_tx_rings(struct ice_vsi *vsi, enum ice_disq_rst_src rst_src,
        ice_for_each_txq(vsi, i) {
                u16 v_idx;
 
-               if (!vsi->tx_rings || !vsi->tx_rings[i]) {
+               if (!vsi->tx_rings || !vsi->tx_rings[i] ||
+                   !vsi->tx_rings[i]->q_vector) {
                        err = -EINVAL;
                        goto err_out;
                }