diff options
| author |   Sergey Matyukevich <sergey.matyukevich.os@quantenna.com> | 2020-02-03 10:56:50 +0000 |
|---|---|---|
| committer |   Johannes Berg <johannes.berg@intel.com> | 2020-02-07 12:53:26 +0100 |
| commit | bfb7bac3a8f47100ebe7961bd14e924c96e21ca7 (patch) | |
| tree | 7f2ff88f27bab2bcf1ce004f4028ec3388bc35df /net/wireless/ethtool.c | |
| parent | mac80211: consider more elements in parsing CRC (diff) | |
| download | linux-dev-bfb7bac3a8f47100ebe7961bd14e924c96e21ca7.tar.xz linux-dev-bfb7bac3a8f47100ebe7961bd14e924c96e21ca7.zip | |
cfg80211: check wiphy driver existence for drvinfo report
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: Sergey Matyukevich <sergey.matyukevich.os@quantenna.com>
Link: https://lore.kernel.org/r/20200203105644.28875-1-sergey.matyukevich.os@quantenna.com
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to '')
| -rw-r--r-- | net/wireless/ethtool.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/net/wireless/ethtool.c b/net/wireless/ethtool.c index a9c0f368db5d..24e18405cdb4 100644 --- a/net/wireless/ethtool.c +++ b/net/wireless/ethtool.c @@ -7,9 +7,13 @@ void cfg80211_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info) { struct wireless_dev *wdev = dev->ieee80211_ptr; + struct device *pdev = wiphy_dev(wdev->wiphy); - strlcpy(info->driver, wiphy_dev(wdev->wiphy)->driver->name, - sizeof(info->driver)); + if (pdev->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)); |