From 67adcd266c4ef3f9356190ef2c0727303f9532cb Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Sun, 2 Mar 2014 15:21:59 +0200 Subject: [PATCH] WNM: Check wpa_s->current_bss more consistently The scan result comparison routine would not make much sense without current BSS level known, so return from the function without going through the iteration that could have dereferenced the pointer if wpa_s->current_bss == NULL. Signed-off-by: Jouni Malinen --- wpa_supplicant/wnm_sta.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/wpa_supplicant/wnm_sta.c b/wpa_supplicant/wnm_sta.c index 0619f6db3..7db6eb69a 100644 --- a/wpa_supplicant/wnm_sta.c +++ b/wpa_supplicant/wnm_sta.c @@ -471,12 +471,11 @@ static int compare_scan_neighbor_results(struct wpa_supplicant *wpa_s, u8 i, j; - if (scan_res == NULL || num_neigh_rep == 0) + if (scan_res == NULL || num_neigh_rep == 0 || !wpa_s->current_bss) return 0; wpa_printf(MSG_DEBUG, "WNM: Current BSS " MACSTR " RSSI %d", - MAC2STR(wpa_s->bssid), - wpa_s->current_bss ? wpa_s->current_bss->level : 0); + MAC2STR(wpa_s->bssid), wpa_s->current_bss->level); for (i = 0; i < num_neigh_rep; i++) { for (j = 0; j < scan_res->num; j++) {