[PATCH 2.6.31] cfg80211: add two missing NULL pointer checks

Johannes Berg
2009-07-29T20:08:17Z

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]
---
net/wireless/scan.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

--- wireless-testing.orig/net/wireless/scan.c 2009-07-29 21:53:49.000000000 +0200
+++ wireless-testing/net/wireless/scan.c 2009-07-29 21:57:27.000000000 +0200
@@ -141,7 +141,7 @@ static int cmp_ies(u8 num, u8 *ies1, siz

if (!ie1 && !ie2)
return 0;
- if (!ie1)
+ if (!ie1 || !ie2)
return -1;

r = memcmp(ie1 + 2, ie2 + 2, min(ie1[1], ie2[1]));
@@ -194,6 +194,8 @@ static bool is_mesh(struct cfg80211_bss
ie = find_ie(WLAN_EID_MESH_CONFIG,
a->information_elements,
a->len_information_elements);
+ if (!ie)
+ return false;
if (ie[1] != IEEE80211_MESH_CONFIG_LEN)
return false;