From 3ff8073db7846f643f57323c7c66d5ad68629110 Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Sun, 2 Mar 2014 15:16:45 +0200 Subject: [PATCH] EAP-FAST: Use clear eap_get_config() result validation This was previously checked through the eap_peer_tls_ssl_init() call which made it difficult for static analyzers. Add an explicit check for config == NULL into the beginnign of eap_fast_init() since this will always result in initialization failing anyway. Signed-off-by: Jouni Malinen --- src/eap_peer/eap_fast.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/eap_peer/eap_fast.c b/src/eap_peer/eap_fast.c index 1b0c562a6..cc1f264bb 100644 --- a/src/eap_peer/eap_fast.c +++ b/src/eap_peer/eap_fast.c @@ -149,14 +149,16 @@ static void * eap_fast_init(struct eap_sm *sm) struct eap_fast_data *data; struct eap_peer_config *config = eap_get_config(sm); + if (config == NULL) + return NULL; + data = os_zalloc(sizeof(*data)); if (data == NULL) return NULL; data->fast_version = EAP_FAST_VERSION; data->max_pac_list_len = 10; - if (config && config->phase1 && - eap_fast_parse_phase1(data, config->phase1) < 0) { + if (config->phase1 && eap_fast_parse_phase1(data, config->phase1) < 0) { eap_fast_deinit(sm, data); return NULL; }