Netdev List
 help / color / mirror / Atom feed
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
To: davem@davemloft.net
Cc: Tony Nguyen <anthony.l.nguyen@intel.com>,
	netdev@vger.kernel.org, nhorman@redhat.com, sassmann@redhat.com,
	Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>,
	Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Subject: [net-next 02/11] ice: Check for q_vector when stopping rings
Date: Tue, 13 Nov 2018 10:32:30 -0800	[thread overview]
Message-ID: <20181113183239.5861-3-jeffrey.t.kirsher@intel.com> (raw)
In-Reply-To: <20181113183239.5861-1-jeffrey.t.kirsher@intel.com>

From: Tony Nguyen <anthony.l.nguyen@intel.com>

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 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/intel/ice/ice_lib.c b/drivers/net/ethernet/intel/ice/ice_lib.c
index 1041fa2a7767..11d0ab185dd2 100644
--- a/drivers/net/ethernet/intel/ice/ice_lib.c
+++ b/drivers/net/ethernet/intel/ice/ice_lib.c
@@ -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;
 		}
-- 
2.19.1

  parent reply	other threads:[~2018-11-14  4:31 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-11-13 18:32 [net-next 00/11][pull request] 100GbE Intel Wired LAN Driver Updates 2018-11-13 Jeff Kirsher
2018-11-13 18:32 ` [net-next 01/11] ice: Fix debug print in ice_tx_timeout Jeff Kirsher
2018-11-13 18:32 ` Jeff Kirsher [this message]
2018-11-13 18:32 ` [net-next 03/11] ice: Remove node before releasing VSI Jeff Kirsher
2018-11-13 18:32 ` [net-next 04/11] ice: Calculate guaranteed VSIs per function and use it Jeff Kirsher
2018-11-13 18:32 ` [net-next 05/11] ice: Avoid nested RTNL locking in ice_dis_vsi Jeff Kirsher
2018-11-13 18:32 ` [net-next 06/11] ice: Fix NVM mask defines Jeff Kirsher
2018-11-13 18:32 ` [net-next 07/11] ice: Increase Rx queue disable timeout Jeff Kirsher
2018-11-13 18:32 ` [net-next 08/11] ice: Call pci_disable_sriov before stopping queues for VF Jeff Kirsher
2018-11-13 18:32 ` [net-next 09/11] ice: Fix to make VLAN priority tagged traffic to appear on all TCs Jeff Kirsher
2018-11-13 18:32 ` [net-next 10/11] ice: Destroy scheduler tree in reset path Jeff Kirsher
2018-11-13 18:32 ` [net-next 11/11] ice: Remove ICE_MAX_TXQ_PER_TXQG check when configuring Tx queue Jeff Kirsher
2018-11-15 19:24 ` [net-next 00/11][pull request] 100GbE Intel Wired LAN Driver Updates 2018-11-13 David Miller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20181113183239.5861-3-jeffrey.t.kirsher@intel.com \
    --to=jeffrey.t.kirsher@intel.com \
    --cc=anirudh.venkataramanan@intel.com \
    --cc=anthony.l.nguyen@intel.com \
    --cc=davem@davemloft.net \
    --cc=netdev@vger.kernel.org \
    --cc=nhorman@redhat.com \
    --cc=sassmann@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox