Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Sergey Matyukevich and committed by
Johannes Berg
bfb7bac3 a04564c9

+6 -2
+6 -2
net/wireless/ethtool.c
··· 7 7 void cfg80211_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info) 8 8 { 9 9 struct wireless_dev *wdev = dev->ieee80211_ptr; 10 + struct device *pdev = wiphy_dev(wdev->wiphy); 10 11 11 - strlcpy(info->driver, wiphy_dev(wdev->wiphy)->driver->name, 12 - sizeof(info->driver)); 12 + if (pdev->driver) 13 + strlcpy(info->driver, pdev->driver->name, 14 + sizeof(info->driver)); 15 + else 16 + strlcpy(info->driver, "N/A", sizeof(info->driver)); 13 17 14 18 strlcpy(info->version, init_utsname()->release, sizeof(info->version)); 15 19