From: Tony Nguyen <anthony.l.nguyen@intel.com>
To: davem@davemloft.net, kuba@kernel.org
Cc: Mitch Williams <mitch.a.williams@intel.com>,
netdev@vger.kernel.org, anthony.l.nguyen@intel.com,
sassmann@redhat.com, Tony Brelinski <tony.brelinski@intel.com>
Subject: [PATCH net 07/10] iavf: validate pointers
Date: Mon, 15 Nov 2021 15:59:31 -0800 [thread overview]
Message-ID: <20211115235934.880882-8-anthony.l.nguyen@intel.com> (raw)
In-Reply-To: <20211115235934.880882-1-anthony.l.nguyen@intel.com>
From: Mitch Williams <mitch.a.williams@intel.com>
In some cases, the ethtool get_rxfh handler may be called with a null
key or indir parameter. So check these pointers, or you will have a very
bad day.
Fixes: 43a3d9ba34c9 ("i40evf: Allow PF driver to configure RSS")
Signed-off-by: Mitch Williams <mitch.a.williams@intel.com>
Tested-by: Tony Brelinski <tony.brelinski@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
---
drivers/net/ethernet/intel/iavf/iavf_ethtool.c | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/drivers/net/ethernet/intel/iavf/iavf_ethtool.c b/drivers/net/ethernet/intel/iavf/iavf_ethtool.c
index 136c801f5584..25ee0606e625 100644
--- a/drivers/net/ethernet/intel/iavf/iavf_ethtool.c
+++ b/drivers/net/ethernet/intel/iavf/iavf_ethtool.c
@@ -1859,14 +1859,13 @@ static int iavf_get_rxfh(struct net_device *netdev, u32 *indir, u8 *key,
if (hfunc)
*hfunc = ETH_RSS_HASH_TOP;
- if (!indir)
- return 0;
-
- memcpy(key, adapter->rss_key, adapter->rss_key_size);
+ if (key)
+ memcpy(key, adapter->rss_key, adapter->rss_key_size);
- /* Each 32 bits pointed by 'indir' is stored with a lut entry */
- for (i = 0; i < adapter->rss_lut_size; i++)
- indir[i] = (u32)adapter->rss_lut[i];
+ if (indir)
+ /* Each 32 bits pointed by 'indir' is stored with a lut entry */
+ for (i = 0; i < adapter->rss_lut_size; i++)
+ indir[i] = (u32)adapter->rss_lut[i];
return 0;
}
--
2.31.1
next prev parent reply other threads:[~2021-11-16 0:04 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-15 23:59 [PATCH net 00/10][pull request] Intel Wired LAN Driver Updates 2021-11-15 Tony Nguyen
2021-11-15 23:59 ` [PATCH net 01/10] iavf: Fix return of set the new channel count Tony Nguyen
2021-11-16 7:07 ` Stefan Assmann
2021-11-15 23:59 ` [PATCH net 02/10] iavf: check for null in iavf_fix_features Tony Nguyen
2021-11-15 23:59 ` [PATCH net 03/10] iavf: free q_vectors before queues in iavf_disable_vf Tony Nguyen
2021-11-15 23:59 ` [PATCH net 04/10] iavf: don't clear a lock we don't hold Tony Nguyen
2021-11-15 23:59 ` [PATCH net 05/10] iavf: Fix failure to exit out from last all-multicast mode Tony Nguyen
2021-11-15 23:59 ` [PATCH net 06/10] iavf: prevent accidental free of filter structure Tony Nguyen
2021-11-16 7:24 ` Stefan Assmann
2021-11-16 20:18 ` Keller, Jacob E
2021-11-17 6:37 ` Stefan Assmann
2021-11-15 23:59 ` Tony Nguyen [this message]
2021-11-15 23:59 ` [PATCH net 08/10] iavf: Fix for the false positive ASQ/ARQ errors while issuing VF reset Tony Nguyen
2021-11-15 23:59 ` [PATCH net 09/10] iavf: Fix for setting queues to 0 Tony Nguyen
2021-11-15 23:59 ` [PATCH net 10/10] iavf: Restore VLAN filters after link down Tony Nguyen
2021-11-16 13:40 ` [PATCH net 00/10][pull request] Intel Wired LAN Driver Updates 2021-11-15 patchwork-bot+netdevbpf
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=20211115235934.880882-8-anthony.l.nguyen@intel.com \
--to=anthony.l.nguyen@intel.com \
--cc=davem@davemloft.net \
--cc=kuba@kernel.org \
--cc=mitch.a.williams@intel.com \
--cc=netdev@vger.kernel.org \
--cc=sassmann@redhat.com \
--cc=tony.brelinski@intel.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