jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix resource leaks on rsn_preauth_init() error paths

Browse source 
The l2_packet instances were not freed on some of the rsn_preauth_init()
error paths.

Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2015-01-31 13:44:48 +02:00
parent 7afa678033
commit 7650f9e7d8
1 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/rsn_supp/preauth.c
View file

@ -172,6 +172,7 @@ int rsn_preauth_init(struct wpa_sm *sm, const u8 *dst,
{ {
struct eapol_config eapol_conf; struct eapol_config eapol_conf;
struct eapol_ctx *ctx; struct eapol_ctx *ctx;
int ret;
if (sm->preauth_eapol) if (sm->preauth_eapol)
return -1; return -1;
@ -197,14 +198,16 @@ int rsn_preauth_init(struct wpa_sm *sm, const u8 *dst,
wpa_printf(MSG_WARNING, "RSN: Failed to initialize L2 " wpa_printf(MSG_WARNING, "RSN: Failed to initialize L2 "
"packet processing (bridge) for " "packet processing (bridge) for "
"pre-authentication"); "pre-authentication");
return -2; ret = -2;
goto fail;
} }
} }
ctx = os_zalloc(sizeof(*ctx)); ctx = os_zalloc(sizeof(*ctx));
if (ctx == NULL) { if (ctx == NULL) {
wpa_printf(MSG_WARNING, "Failed to allocate EAPOL context."); wpa_printf(MSG_WARNING, "Failed to allocate EAPOL context.");
return -4; ret = -4;
goto fail;
} }
ctx->ctx = sm->ctx->ctx; ctx->ctx = sm->ctx->ctx;
ctx->msg_ctx = sm->ctx->ctx; ctx->msg_ctx = sm->ctx->ctx;
@ -222,7 +225,8 @@ int rsn_preauth_init(struct wpa_sm *sm, const u8 *dst,
os_free(ctx); os_free(ctx);
wpa_printf(MSG_WARNING, "RSN: Failed to initialize EAPOL " wpa_printf(MSG_WARNING, "RSN: Failed to initialize EAPOL "
"state machines for pre-authentication"); "state machines for pre-authentication");
return -3; ret = -3;
goto fail;
} }
os_memset(&eapol_conf, 0, sizeof(eapol_conf)); os_memset(&eapol_conf, 0, sizeof(eapol_conf));
eapol_conf.accept_802_1x_keys = 0; eapol_conf.accept_802_1x_keys = 0;
@ -247,6 +251,15 @@ int rsn_preauth_init(struct wpa_sm *sm, const u8 *dst,
rsn_preauth_timeout, sm, NULL); rsn_preauth_timeout, sm, NULL);
return 0; return 0;
fail:
if (sm->l2_preauth_br) {
l2_packet_deinit(sm->l2_preauth_br);
sm->l2_preauth_br = NULL;
}
l2_packet_deinit(sm->l2_preauth);
sm->l2_preauth = NULL;
return ret;
} }