Commit 045a4f5c authored by Sergey Matyukevich's avatar Sergey Matyukevich Committed by Kelsey Skunberg

cfg80211: check wiphy driver existence for drvinfo report

BugLink: https://bugs.launchpad.net/bugs/1868628

[ Upstream commit bfb7bac3 ]

When preparing ethtool drvinfo, check if wiphy driver is defined
before dereferencing it. Driver may not exist, e.g. if wiphy is
attached to a virtual platform device.
Signed-off-by: default avatarSergey Matyukevich <sergey.matyukevich.os@quantenna.com>
Link: https://lore.kernel.org/r/20200203105644.28875-1-sergey.matyukevich.os@quantenna.comSigned-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarKhalid Elmously <khalid.elmously@canonical.com>
Signed-off-by: default avatarKelsey Skunberg <kelsey.skunberg@canonical.com>
parent bfd53c43
...@@ -6,9 +6,13 @@ ...@@ -6,9 +6,13 @@
void cfg80211_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info) void cfg80211_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)
{ {
struct wireless_dev *wdev = dev->ieee80211_ptr; struct wireless_dev *wdev = dev->ieee80211_ptr;
struct device *pdev = wiphy_dev(wdev->wiphy);
strlcpy(info->driver, wiphy_dev(wdev->wiphy)->driver->name, if (pdev->driver)
sizeof(info->driver)); strlcpy(info->driver, pdev->driver->name,
sizeof(info->driver));
else
strlcpy(info->driver, "N/A", sizeof(info->driver));
strlcpy(info->version, init_utsname()->release, sizeof(info->version)); strlcpy(info->version, init_utsname()->release, sizeof(info->version));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment