netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
To: davem@davemloft.net
Cc: Andre Guedes <andre.guedes@intel.com>,
	netdev@vger.kernel.org, nhorman@redhat.com, sassmann@redhat.com,
	Aaron Brown <aaron.f.brown@intel.com>,
	Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Subject: [net-next 03/17] igc: Fix locking issue when retrieving NFC rules
Date: Fri, 22 May 2020 19:50:55 -0700	[thread overview]
Message-ID: <20200523025109.3313635-4-jeffrey.t.kirsher@intel.com> (raw)
In-Reply-To: <20200523025109.3313635-1-jeffrey.t.kirsher@intel.com>

From: Andre Guedes <andre.guedes@intel.com>

Access to NFC rules stored in adapter->nfc_rule_list is protect by
adapter->nfc_rule_lock. The functions igc_ethtool_get_nfc_rule()
and igc_ethtool_get_nfc_rules() are missing to hold the lock while
accessing rule objects.

Signed-off-by: Andre Guedes <andre.guedes@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 drivers/net/ethernet/intel/igc/igc_ethtool.c | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/intel/igc/igc_ethtool.c b/drivers/net/ethernet/intel/igc/igc_ethtool.c
index 24aa321f64b5..decd29fbfbe2 100644
--- a/drivers/net/ethernet/intel/igc/igc_ethtool.c
+++ b/drivers/net/ethernet/intel/igc/igc_ethtool.c
@@ -939,16 +939,18 @@ static int igc_ethtool_get_nfc_rule(struct igc_adapter *adapter,
 
 	cmd->data = IGC_MAX_RXNFC_RULES;
 
+	spin_lock(&adapter->nfc_rule_lock);
+
 	hlist_for_each_entry(rule, &adapter->nfc_rule_list, nfc_node) {
 		if (fsp->location <= rule->location)
 			break;
 	}
 
 	if (!rule || fsp->location != rule->location)
-		return -EINVAL;
+		goto out;
 
 	if (!rule->filter.match_flags)
-		return -EINVAL;
+		goto out;
 
 	fsp->flow_type = ETHER_FLOW;
 	fsp->ring_cookie = rule->action;
@@ -976,7 +978,12 @@ static int igc_ethtool_get_nfc_rule(struct igc_adapter *adapter,
 		eth_broadcast_addr(fsp->m_u.ether_spec.h_source);
 	}
 
+	spin_unlock(&adapter->nfc_rule_lock);
 	return 0;
+
+out:
+	spin_unlock(&adapter->nfc_rule_lock);
+	return -EINVAL;
 }
 
 static int igc_ethtool_get_nfc_rules(struct igc_adapter *adapter,
@@ -988,13 +995,19 @@ static int igc_ethtool_get_nfc_rules(struct igc_adapter *adapter,
 
 	cmd->data = IGC_MAX_RXNFC_RULES;
 
+	spin_lock(&adapter->nfc_rule_lock);
+
 	hlist_for_each_entry(rule, &adapter->nfc_rule_list, nfc_node) {
-		if (cnt == cmd->rule_cnt)
+		if (cnt == cmd->rule_cnt) {
+			spin_unlock(&adapter->nfc_rule_lock);
 			return -EMSGSIZE;
+		}
 		rule_locs[cnt] = rule->location;
 		cnt++;
 	}
 
+	spin_unlock(&adapter->nfc_rule_lock);
+
 	cmd->rule_cnt = cnt;
 
 	return 0;
-- 
2.26.2


  parent reply	other threads:[~2020-05-23  2:51 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-05-23  2:50 [net-next 00/17][pull request] 1GbE Intel Wired LAN Driver Updates 2020-05-22 Jeff Kirsher
2020-05-23  2:50 ` [net-next 01/17] igc: Refactor igc_ethtool_add_nfc_rule() Jeff Kirsher
2020-05-23  2:50 ` [net-next 02/17] igc: Fix 'sw_idx' type in struct igc_nfc_rule Jeff Kirsher
2020-05-23  2:50 ` Jeff Kirsher [this message]
2020-05-23  2:50 ` [net-next 04/17] igc: Fix NFC rule overwrite cases Jeff Kirsher
2020-05-23  2:50 ` [net-next 05/17] igc: Fix NFC rules with multicast addresses Jeff Kirsher
2020-05-23  2:50 ` [net-next 06/17] igc: Fix NFC rules restoration Jeff Kirsher
2020-05-23  2:50 ` [net-next 07/17] igc: Refactor igc_ethtool_update_nfc_rule() Jeff Kirsher
2020-05-23  2:51 ` [net-next 08/17] igc: Fix NFC rules leak when driver is unloaded Jeff Kirsher
2020-05-23  2:51 ` [net-next 09/17] igc: Fix NFC rule validation Jeff Kirsher
2020-05-23  2:51 ` [net-next 10/17] igc: Change return type from igc_disable_nfc_rule() Jeff Kirsher
2020-05-23  2:51 ` [net-next 11/17] igc: Change adapter->nfc_rule_lock to mutex Jeff Kirsher
2020-05-23  2:51 ` [net-next 12/17] igc: Remove igc_nfc_rule_exit() Jeff Kirsher
2020-05-23  2:51 ` [net-next 13/17] igc: Remove unused descriptor's flags Jeff Kirsher
2020-05-23  2:51 ` [net-next 14/17] igb: Report speed and duplex as unknown when device is runtime suspended Jeff Kirsher
2020-05-23  2:51 ` [net-next 15/17] e1000e: Warn if disabling ULP failed Jeff Kirsher
2020-05-23  2:51 ` [net-next 16/17] e1000e: Disable TSO for buffer overrun workaround Jeff Kirsher
2020-05-23  2:51 ` [net-next 17/17] e1000e: disable s0ix entry and exit flows for ME systems Jeff Kirsher
2020-05-23 23:48 ` [net-next 00/17][pull request] 1GbE Intel Wired LAN Driver Updates 2020-05-22 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=20200523025109.3313635-4-jeffrey.t.kirsher@intel.com \
    --to=jeffrey.t.kirsher@intel.com \
    --cc=aaron.f.brown@intel.com \
    --cc=andre.guedes@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;
as well as URLs for NNTP newsgroup(s).