hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cfg80211: add two missing NULL pointer checks 

These pointers can be NULL, the is_mesh() case isn't
ever hit in the current kernel, but cmp_ies() can be
hit under certain conditions.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Cc: stable@kernel.org [2.6.29, 2.6.30]
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Johannes Berg 2009-07-29 22:07:44 +02:00 committed by John W. Linville
parent eb4ad82641
commit cd3468bad9
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/wireless/scan.c
View File

@ -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;