Fix memory leak on NFC DH generation error path

It was possible for some NFC DH generation error paths to leak memory
since the old private/public key was not freed if an allocation failed.

Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2015-11-29 20:53:20 +02:00
parent c5ef7bbfa5
commit 4104267e81
2 changed files with 7 additions and 1 deletions

View file

@ -1218,14 +1218,19 @@ struct wpabuf * dh_init(const struct dh_group *dh, struct wpabuf **priv)
pv_len = dh->prime_len;
pv = wpabuf_alloc(pv_len);
if (pv == NULL)
if (pv == NULL) {
wpabuf_clear_free(*priv);
*priv = NULL;
return NULL;
}
if (crypto_mod_exp(dh->generator, dh->generator_len,
wpabuf_head(*priv), wpabuf_len(*priv),
dh->prime, dh->prime_len, wpabuf_mhead(pv),
&pv_len) < 0) {
wpabuf_clear_free(pv);
wpa_printf(MSG_INFO, "DH: crypto_mod_exp failed");
wpabuf_clear_free(*priv);
*priv = NULL;
return NULL;
}
wpabuf_put(pv, pv_len);