From: Tony Nguyen <anthony.l.nguyen@intel.com>
To: davem@davemloft.net, kuba@kernel.org
Cc: Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>,
netdev@vger.kernel.org, anthony.l.nguyen@intel.com,
Gurucharan G <gurucharanx.g@intel.com>,
Konrad Jankowski <konrad0.jankowski@intel.com>
Subject: [PATCH net 1/4] ice: Prevent probing virtual functions
Date: Mon, 9 Aug 2021 10:13:59 -0700 [thread overview]
Message-ID: <20210809171402.17838-2-anthony.l.nguyen@intel.com> (raw)
In-Reply-To: <20210809171402.17838-1-anthony.l.nguyen@intel.com>
From: Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>
The userspace utility "driverctl" can be used to change/override the
system's default driver choices. This is useful in some situations
(buggy driver, old driver missing a device ID, trying a workaround,
etc.) where the user needs to load a different driver.
However, this is also prone to user error, where a driver is mapped
to a device it's not designed to drive. For example, if the ice driver
is mapped to driver iavf devices, the ice driver crashes.
Add a check to return an error if the ice driver is being used to
probe a virtual function.
Fixes: 837f08fdecbe ("ice: Add basic driver framework for Intel(R) E800 Series")
Signed-off-by: Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>
Tested-by: Gurucharan G <gurucharanx.g@intel.com>
Tested-by: Konrad Jankowski <konrad0.jankowski@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
---
drivers/net/ethernet/intel/ice/ice_main.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c
index ef8d1815af56..a9506041eb42 100644
--- a/drivers/net/ethernet/intel/ice/ice_main.c
+++ b/drivers/net/ethernet/intel/ice/ice_main.c
@@ -4194,6 +4194,11 @@ ice_probe(struct pci_dev *pdev, const struct pci_device_id __always_unused *ent)
struct ice_hw *hw;
int i, err;
+ if (pdev->is_virtfn) {
+ dev_err(dev, "can't probe a virtual function\n");
+ return -EINVAL;
+ }
+
/* this driver uses devres, see
* Documentation/driver-api/driver-model/devres.rst
*/
--
2.26.2
next prev parent reply other threads:[~2021-08-09 17:10 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-09 17:13 [PATCH net 0/4][pull request] Intel Wired LAN Driver Updates 2021-08-09 Tony Nguyen
2021-08-09 17:13 ` Tony Nguyen [this message]
2021-08-09 22:56 ` [PATCH net 1/4] ice: Prevent probing virtual functions Jakub Kicinski
2021-08-09 17:14 ` [PATCH net 2/4] ice: Stop processing VF messages during teardown Tony Nguyen
2021-08-09 22:58 ` Jakub Kicinski
2021-08-10 17:42 ` Venkataramanan, Anirudh
2021-08-10 14:30 ` Jonathan Toppins
2021-08-09 17:14 ` [PATCH net 3/4] ice: don't remove netdev->dev_addr from uc sync list Tony Nguyen
2021-08-10 14:29 ` Jonathan Toppins
2021-08-09 17:14 ` [PATCH net 4/4] iavf: Set RSS LUT and key in reset handle path Tony Nguyen
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=20210809171402.17838-2-anthony.l.nguyen@intel.com \
--to=anthony.l.nguyen@intel.com \
--cc=anirudh.venkataramanan@intel.com \
--cc=davem@davemloft.net \
--cc=gurucharanx.g@intel.com \
--cc=konrad0.jankowski@intel.com \
--cc=kuba@kernel.org \
--cc=netdev@vger.kernel.org \
/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).