From: Jouni Malinen <j@w1.fi>
Date: Sat, 28 May 2016 19:16:47 +0000 (+0300)
Subject: Improve reattach scan OOM failure handling
X-Git-Tag: hostap_2_6~447
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8e909fa92e59c9a4bc0472603decb8a334f7808a;p=thirdparty%2Fhostap.git

Improve reattach scan OOM failure handling

Instead of reporting the memory allocation failure and stopping, run the
scan even if the frequency list cannot be created due to allocation
failure. This allows the wpa_s->reattach flag to be cleared and the scan
to be completed even if it takes a bit longer time due to all channels
getting scanned.

Signed-off-by: Jouni Malinen <j@w1.fi>
---

diff --git a/wpa_supplicant/scan.c b/wpa_supplicant/scan.c
index cb223abca..40469cae1 100644
--- a/wpa_supplicant/scan.c
+++ b/wpa_supplicant/scan.c
@@ -835,12 +835,10 @@ static void wpa_supplicant_scan(void *eloop_ctx, void *timeout_ctx)
 		 * slot for the zero-terminator.
 		 */
 		params.freqs = os_malloc(sizeof(int) * 2);
-		if (params.freqs == NULL) {
-			wpa_dbg(wpa_s, MSG_ERROR, "Memory allocation failed");
-			return;
+		if (params.freqs) {
+			params.freqs[0] = wpa_s->assoc_freq;
+			params.freqs[1] = 0;
 		}
-		params.freqs[0] = wpa_s->assoc_freq;
-		params.freqs[1] = 0;
 
 		/*
 		 * Reset the reattach flag so that we fall back to full scan if