From: Jouni Malinen <jouni@qca.qualcomm.com>
Date: Mon, 16 May 2016 18:06:44 +0000 (+0300)
Subject: WPS: Check sha256_vector() result in wps_build_oob_dev_pw()
X-Git-Tag: hostap_2_6~479
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=636a23881bafb18b28465793a03d058103138cd8;p=thirdparty%2Fhostap.git

WPS: Check sha256_vector() result in wps_build_oob_dev_pw()

This gets rid of a valgrind warning on uninitialized memory read in the
wpas_ctrl_error test case where the result was used after the failed
sha256_vector() call.

Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
---

diff --git a/src/wps/wps_attr_build.c b/src/wps/wps_attr_build.c
index 2efc27ec4..770f5e90c 100644
--- a/src/wps/wps_attr_build.c
+++ b/src/wps/wps_attr_build.c
@@ -413,7 +413,8 @@ int wps_build_oob_dev_pw(struct wpabuf *msg, u16 dev_pw_id,
 		   dev_pw_id);
 	addr[0] = wpabuf_head(pubkey);
 	hash_len = wpabuf_len(pubkey);
-	sha256_vector(1, addr, &hash_len, pubkey_hash);
+	if (sha256_vector(1, addr, &hash_len, pubkey_hash) < 0)
+		return -1;
 #ifdef CONFIG_WPS_TESTING
 	if (wps_corrupt_pkhash) {
 		wpa_hexdump(MSG_DEBUG, "WPS: Real Public Key Hash",