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

nl80211: Unconditionally clear nl_msg

Browse source 
Previously nl80211_nlmsg_clear() would be called under a special
condition when valid_handler is NULL and valid_data is -1. Such API is
not very convenient as it forces the handler to be NULL. Change the
send_and_recv() function to always clear the nl_msg, which will simplify
all this logic.

Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
This commit is contained in:
Andrei Otcheretianski 2021-02-17 12:14:32 +02:00 committed by Jouni Malinen
parent 6c7b0a9657
commit 8265f84531
1 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/drivers/driver_nl80211.c
View file

@ -467,8 +467,8 @@ static int send_and_recv(struct nl80211_global *global,
} }
out: out:
nl_cb_put(cb); nl_cb_put(cb);
if (!valid_handler && valid_data == (void *) -1) /* Always clear the message as it can potentially contain keys */
nl80211_nlmsg_clear(msg); nl80211_nlmsg_clear(msg);
nlmsg_free(msg); nlmsg_free(msg);
return err; return err;
} }
@ -3164,7 +3164,7 @@ static int issue_key_mgmt_set_key(struct wpa_driver_nl80211_data *drv,
nlmsg_free(msg); nlmsg_free(msg);
return -1; return -1;
} }
ret = send_and_recv_msgs(drv, msg, NULL, (void *) -1, NULL, NULL); ret = send_and_recv_msgs(drv, msg, NULL, NULL, NULL, NULL);
if (ret) { if (ret) {
wpa_printf(MSG_DEBUG, wpa_printf(MSG_DEBUG,
"nl80211: Key management set key failed: ret=%d (%s)", "nl80211: Key management set key failed: ret=%d (%s)",
@ -3204,7 +3204,7 @@ static int nl80211_set_pmk(struct wpa_driver_nl80211_data *drv,
return -ENOBUFS; return -ENOBUFS;
} }
ret = send_and_recv_msgs(drv, msg, NULL, (void *) -1, NULL, NULL); ret = send_and_recv_msgs(drv, msg, NULL, NULL, NULL, NULL);
if (ret) { if (ret) {
wpa_printf(MSG_DEBUG, "nl80211: Set PMK failed: ret=%d (%s)", wpa_printf(MSG_DEBUG, "nl80211: Set PMK failed: ret=%d (%s)",
ret, strerror(-ret)); ret, strerror(-ret));
@ -3370,8 +3370,7 @@ static int wpa_driver_nl80211_set_key(struct i802_bss *bss,
goto fail; goto fail;
} }
ret = send_and_recv_msgs(drv, msg, NULL, key ? (void *) -1 : NULL, ret = send_and_recv_msgs(drv, msg, NULL, NULL, NULL, NULL);
NULL, NULL);
if ((ret == -ENOENT || ret == -ENOLINK) && alg == WPA_ALG_NONE) if ((ret == -ENOENT || ret == -ENOLINK) && alg == WPA_ALG_NONE)
ret = 0; ret = 0;
if (ret) if (ret)
@ -6360,7 +6359,7 @@ skip_auth_type:
goto fail; goto fail;
ret = send_and_recv_msgs_owner(drv, msg, nl_connect, 1, NULL, ret = send_and_recv_msgs_owner(drv, msg, nl_connect, 1, NULL,
(void *) -1, NULL, NULL); NULL, NULL, NULL);
msg = NULL; msg = NULL;
if (ret) { if (ret) {
wpa_printf(MSG_DEBUG, "nl80211: MLME connect failed: ret=%d " wpa_printf(MSG_DEBUG, "nl80211: MLME connect failed: ret=%d "
@ -8710,7 +8709,7 @@ static int nl80211_pmkid(struct i802_bss *bss, int cmd,
return -ENOBUFS; return -ENOBUFS;
} }
return send_and_recv_msgs(bss->drv, msg, NULL, (void *) -1, NULL, NULL); return send_and_recv_msgs(bss->drv, msg, NULL, NULL, NULL, NULL);
} }
@ -8980,7 +8979,7 @@ static void nl80211_set_rekey_info(void *priv, const u8 *kek, size_t kek_len,
nla_nest_end(msg, replay_nested); nla_nest_end(msg, replay_nested);
ret = send_and_recv_msgs(drv, msg, NULL, (void *) -1, NULL, NULL); ret = send_and_recv_msgs(drv, msg, NULL, NULL, NULL, NULL);
if (ret == -EOPNOTSUPP) { if (ret == -EOPNOTSUPP) {
wpa_printf(MSG_DEBUG, wpa_printf(MSG_DEBUG,
"nl80211: Driver does not support rekey offload"); "nl80211: Driver does not support rekey offload");