Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2024-12-22 21:22:37 +01:00
Code Releases Activity

wiphy: Fix printing supported iftypes

Browse Source 
dbus_iftype_to_string returns NULL for unknown iftypes, the strdup will
also return NULL and ret[i] will be assigned a NULL.  As a result
the l_strjoinv will not print the known iftypes that might have come
after that and will the l_strfreev will leak the strduped strings.
This commit is contained in:
Andrew Zaborowski 2019-03-11 15:43:20 +01:00 committed by Denis Kenzior
parent 98623edd7d
commit e344df432b
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/wiphy.c
View File

@ -310,10 +310,14 @@ static char **wiphy_get_supported_iftypes(struct wiphy *wiphy)
unsigned int j; unsigned int j;
for (j = 0, i = 0; i < sizeof(wiphy->supported_iftypes) * 8; i++) { for (j = 0, i = 0; i < sizeof(wiphy->supported_iftypes) * 8; i++) {
const char *str;
if (!(wiphy->supported_iftypes & (1 << i))) if (!(wiphy->supported_iftypes & (1 << i)))
continue; continue;
ret[j++] = l_strdup(dbus_iftype_to_string(i + 1)); str = dbus_iftype_to_string(i + 1);
if (str)
ret[j++] = l_strdup(str);
} }
return ret; return ret;