DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

nl80211: Verify that cipher suite conversion succeeds

Browse source 
It was possible for the WPA_ALG_PMK algorithm in set_key() to result in
trying to configure a key with cipher suite 0. While this results in a
failure from cfg80211 or driver, this is not really desirable operation,
so add a check for cipher suite conversion result before issuing the
nl80211 command.

Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
This commit is contained in:
Jouni Malinen 2015-04-27 16:49:06 +03:00 • committed by Jouni Malinen
parent a250722f38
commit 346517674a
1 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/drivers/driver_nl80211.c
View file

@ -2501,7 +2501,7 @@ static int wpa_driver_nl80211_set_key(const char *ifname, struct i802_bss *bss,
{ {
struct wpa_driver_nl80211_data *drv = bss->drv; struct wpa_driver_nl80211_data *drv = bss->drv;
int ifindex; int ifindex;
struct nl_msg *msg; struct nl_msg *msg = NULL;
int ret; int ret;
int tdls = 0; int tdls = 0;
@ -2534,11 +2534,15 @@ static int wpa_driver_nl80211_set_key(const char *ifname, struct i802_bss *bss,
if (!msg) if (!msg)
return -ENOBUFS; return -ENOBUFS;
} else { } else {
u32 suite;
suite = wpa_alg_to_cipher_suite(alg, key_len);
if (!suite)
goto fail;
msg = nl80211_ifindex_msg(drv, ifindex, 0, NL80211_CMD_NEW_KEY); msg = nl80211_ifindex_msg(drv, ifindex, 0, NL80211_CMD_NEW_KEY);
if (!msg || if (!msg ||
nla_put(msg, NL80211_ATTR_KEY_DATA, key_len, key) || nla_put(msg, NL80211_ATTR_KEY_DATA, key_len, key) ||
nla_put_u32(msg, NL80211_ATTR_KEY_CIPHER, nla_put_u32(msg, NL80211_ATTR_KEY_CIPHER, suite))
wpa_alg_to_cipher_suite(alg, key_len)))
goto fail; goto fail;
wpa_hexdump_key(MSG_DEBUG, "nl80211: KEY_DATA", key, key_len); wpa_hexdump_key(MSG_DEBUG, "nl80211: KEY_DATA", key, key_len);
} }
@ -2640,9 +2644,15 @@ static int nl_add_key(struct nl_msg *msg, enum wpa_alg alg,
const u8 *key, size_t key_len) const u8 *key, size_t key_len)
{ {
struct nlattr *key_attr = nla_nest_start(msg, NL80211_ATTR_KEY); struct nlattr *key_attr = nla_nest_start(msg, NL80211_ATTR_KEY);
u32 suite;
if (!key_attr) if (!key_attr)
return -1; return -1;
suite = wpa_alg_to_cipher_suite(alg, key_len);
if (!suite)
return -1;
if (defkey && alg == WPA_ALG_IGTK) { if (defkey && alg == WPA_ALG_IGTK) {
if (nla_put_flag(msg, NL80211_KEY_DEFAULT_MGMT)) if (nla_put_flag(msg, NL80211_KEY_DEFAULT_MGMT))
return -1; return -1;
@ -2652,8 +2662,7 @@ static int nl_add_key(struct nl_msg *msg, enum wpa_alg alg,
} }
if (nla_put_u8(msg, NL80211_KEY_IDX, key_idx) || if (nla_put_u8(msg, NL80211_KEY_IDX, key_idx) ||
nla_put_u32(msg, NL80211_KEY_CIPHER, nla_put_u32(msg, NL80211_KEY_CIPHER, suite) ||
wpa_alg_to_cipher_suite(alg, key_len)) ||
(seq && seq_len && (seq && seq_len &&
nla_put(msg, NL80211_KEY_SEQ, seq_len, seq)) || nla_put(msg, NL80211_KEY_SEQ, seq_len, seq)) ||
nla_put(msg, NL80211_KEY_DATA, key_len, key)) nla_put(msg, NL80211_KEY_DATA, key_len, key))