cfg80211: check wiphy driver existence for drvinfo report
[ Upstream commit bfb7bac3a8
]
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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
5d6df86cad
commit
fd206c770d
|
@ -7,9 +7,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));
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue