Kernel
/
iwd
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git
3
0
Fork 0
Code Releases Activity

station: Check network_get_psk/passphrase return values 

Check the returned values are not NULL.
This commit is contained in:
Andrew Zaborowski 2018-12-10 14:51:35 +01:00 committed by Denis Kenzior
parent aef4dd4286
commit 57ce6d0ca5
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/station.c
View File

@ -546,18 +546,30 @@ static struct handshake_state *station_handshake_setup(struct station *station,
if (security == SECURITY_PSK) {
/* SAE will generate/set the PMK */
if (IE_AKM_IS_SAE(hs->akm_suite))
handshake_state_set_passphrase(hs,
network_get_passphrase(network));
else
handshake_state_set_pmk(hs,
network_get_psk(network), 32);
if (IE_AKM_IS_SAE(hs->akm_suite)) {
const char *passphrase =
network_get_passphrase(network);
if (!passphrase)
goto no_psk;
handshake_state_set_passphrase(hs, passphrase);
} else {
const uint8_t *psk = network_get_psk(network);
if (!psk)
goto no_psk;
handshake_state_set_pmk(hs, psk, 32);
}
} else if (security == SECURITY_8021X)
handshake_state_set_8021x_config(hs,
network_get_settings(network));
return hs;
no_psk:
l_warn("Missing network PSK/passphrase");
not_supported:
handshake_state_free(hs);