|
@@ -118,7 +118,7 @@ static int cmp_ies(u8 num, u8 *ies1, size_t len1, u8 *ies2, size_t len2)
|
|
|
|
|
|
if (!ie1 && !ie2)
|
|
if (!ie1 && !ie2)
|
|
return 0;
|
|
return 0;
|
|
- if (!ie1)
|
|
|
|
|
|
+ if (!ie1 || !ie2)
|
|
return -1;
|
|
return -1;
|
|
|
|
|
|
r = memcmp(ie1 + 2, ie2 + 2, min(ie1[1], ie2[1]));
|
|
r = memcmp(ie1 + 2, ie2 + 2, min(ie1[1], ie2[1]));
|
|
@@ -171,6 +171,8 @@ static bool is_mesh(struct cfg80211_bss *a,
|
|
ie = find_ie(WLAN_EID_MESH_CONFIG,
|
|
ie = find_ie(WLAN_EID_MESH_CONFIG,
|
|
a->information_elements,
|
|
a->information_elements,
|
|
a->len_information_elements);
|
|
a->len_information_elements);
|
|
|
|
+ if (!ie)
|
|
|
|
+ return false;
|
|
if (ie[1] != IEEE80211_MESH_CONFIG_LEN)
|
|
if (ie[1] != IEEE80211_MESH_CONFIG_LEN)
|
|
return false;
|
|
return false;
|
|
|
|
|