Skip to content

Commit bfb7bac

Browse files
Sergey Matyukevichjmberg-intel
authored andcommitted
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 <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Johannes Berg <[email protected]>
1 parent a04564c commit bfb7bac

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

net/wireless/ethtool.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,13 @@
77
void cfg80211_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)
88
{
99
struct wireless_dev *wdev = dev->ieee80211_ptr;
10+
struct device *pdev = wiphy_dev(wdev->wiphy);
1011

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));
1317

1418
strlcpy(info->version, init_utsname()->release, sizeof(info->version));
1519

0 commit comments

Comments
 (0)