Amazing-Mirror/fragattacks
1
0
Fork 0
mirror of https://github.com/vanhoefm/fragattacks.git synced 2025-02-26 13:49:35 -05:00
Code Issues Projects Releases Wiki Activity

nl80211: Get rid of NLA_PUT* macro use in capability checking

Browse Source 
This gets rid of NLA_PUT* macro use in checking nl80211 capabilities to
reduce the number of functions that depend on the hidden behavior of
jumping to the nla_put_failure label.

Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2014-12-05 19:24:38 +02:00
parent f27f1644a8
commit 9589a91e0e
1 changed files with 31 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
src/drivers/driver_nl80211_capa.c
View File

@ -42,15 +42,16 @@ static u32 get_nl80211_protocol_features(struct wpa_driver_nl80211_data *drv)
msg = nlmsg_alloc(); msg = nlmsg_alloc();
if (!msg) if (!msg)
goto nla_put_failure; return 0;
if (!nl80211_cmd(drv, msg, 0, NL80211_CMD_GET_PROTOCOL_FEATURES)) {
nlmsg_free(msg);
return 0;
}
nl80211_cmd(drv, msg, 0, NL80211_CMD_GET_PROTOCOL_FEATURES);
if (send_and_recv_msgs(drv, msg, protocol_feature_handler, &feat) == 0) if (send_and_recv_msgs(drv, msg, protocol_feature_handler, &feat) == 0)
return feat; return feat;
msg = NULL;
nla_put_failure:
nlmsg_free(msg);
return 0; return 0;
} }
@ -581,6 +582,7 @@ static int wpa_driver_nl80211_get_info(struct wpa_driver_nl80211_data *drv,
{ {
u32 feat; u32 feat;
struct nl_msg *msg; struct nl_msg *msg;
int flags = 0;
os_memset(info, 0, sizeof(*info)); os_memset(info, 0, sizeof(*info));
info->capa = &drv->capa; info->capa = &drv->capa;
@ -592,13 +594,13 @@ static int wpa_driver_nl80211_get_info(struct wpa_driver_nl80211_data *drv,
feat = get_nl80211_protocol_features(drv); feat = get_nl80211_protocol_features(drv);
if (feat & NL80211_PROTOCOL_FEATURE_SPLIT_WIPHY_DUMP) if (feat & NL80211_PROTOCOL_FEATURE_SPLIT_WIPHY_DUMP)
nl80211_cmd(drv, msg, NLM_F_DUMP, NL80211_CMD_GET_WIPHY); flags = NLM_F_DUMP;
else if (!nl80211_cmd(drv, msg, flags, NL80211_CMD_GET_WIPHY) ||
nl80211_cmd(drv, msg, 0, NL80211_CMD_GET_WIPHY); nla_put_flag(msg, NL80211_ATTR_SPLIT_WIPHY_DUMP) ||
nl80211_set_iface_id(msg, drv->first_bss) < 0) {
NLA_PUT_FLAG(msg, NL80211_ATTR_SPLIT_WIPHY_DUMP); nlmsg_free(msg);
if (nl80211_set_iface_id(msg, drv->first_bss) < 0) return -1;
goto nla_put_failure; }
if (send_and_recv_msgs(drv, msg, wiphy_info_handler, info)) if (send_and_recv_msgs(drv, msg, wiphy_info_handler, info))
return -1; return -1;
@ -637,9 +639,6 @@ static int wpa_driver_nl80211_get_info(struct wpa_driver_nl80211_data *drv,
drv->capa.wmm_ac_supported = info->wmm_ac_supported; drv->capa.wmm_ac_supported = info->wmm_ac_supported;
return 0; return 0;
nla_put_failure:
nlmsg_free(msg);
return -1;
} }
@ -686,20 +685,18 @@ static void qca_nl80211_check_dfs_capa(struct wpa_driver_nl80211_data *drv)
if (!msg) if (!msg)
return; return;
nl80211_cmd(drv, msg, 0, NL80211_CMD_VENDOR); if (!nl80211_cmd(drv, msg, 0, NL80211_CMD_VENDOR) ||
nla_put_u32(msg, NL80211_ATTR_IFINDEX, drv->ifindex) ||
NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, drv->ifindex); nla_put_u32(msg, NL80211_ATTR_VENDOR_ID, OUI_QCA) ||
NLA_PUT_U32(msg, NL80211_ATTR_VENDOR_ID, OUI_QCA); nla_put_u32(msg, NL80211_ATTR_VENDOR_SUBCMD,
NLA_PUT_U32(msg, NL80211_ATTR_VENDOR_SUBCMD, QCA_NL80211_VENDOR_SUBCMD_DFS_CAPABILITY)) {
QCA_NL80211_VENDOR_SUBCMD_DFS_CAPABILITY); nlmsg_free(msg);
return;
}
ret = send_and_recv_msgs(drv, msg, dfs_info_handler, &dfs_capability); ret = send_and_recv_msgs(drv, msg, dfs_info_handler, &dfs_capability);
if (!ret && dfs_capability) if (!ret && dfs_capability)
drv->capa.flags |= WPA_DRIVER_FLAGS_DFS_OFFLOAD; drv->capa.flags |= WPA_DRIVER_FLAGS_DFS_OFFLOAD;
msg = NULL;
nla_put_failure:
nlmsg_free(msg);
} }
@ -1416,6 +1413,7 @@ nl80211_get_hw_feature_data(void *priv, u16 *num_modes, u16 *flags)
u32 feat; u32 feat;
struct i802_bss *bss = priv; struct i802_bss *bss = priv;
struct wpa_driver_nl80211_data *drv = bss->drv; struct wpa_driver_nl80211_data *drv = bss->drv;
int nl_flags = 0;
struct nl_msg *msg; struct nl_msg *msg;
struct phy_info_arg result = { struct phy_info_arg result = {
.num_modes = num_modes, .num_modes = num_modes,
@ -1432,21 +1430,19 @@ nl80211_get_hw_feature_data(void *priv, u16 *num_modes, u16 *flags)
feat = get_nl80211_protocol_features(drv); feat = get_nl80211_protocol_features(drv);
if (feat & NL80211_PROTOCOL_FEATURE_SPLIT_WIPHY_DUMP) if (feat & NL80211_PROTOCOL_FEATURE_SPLIT_WIPHY_DUMP)
nl80211_cmd(drv, msg, NLM_F_DUMP, NL80211_CMD_GET_WIPHY); nl_flags = NLM_F_DUMP;
else if (!nl80211_cmd(drv, msg, nl_flags, NL80211_CMD_GET_WIPHY) ||
nl80211_cmd(drv, msg, 0, NL80211_CMD_GET_WIPHY); nla_put_flag(msg, NL80211_ATTR_SPLIT_WIPHY_DUMP) ||
nl80211_set_iface_id(msg, bss) < 0) {
NLA_PUT_FLAG(msg, NL80211_ATTR_SPLIT_WIPHY_DUMP); nlmsg_free(msg);
if (nl80211_set_iface_id(msg, bss) < 0) return NULL;
goto nla_put_failure; }
if (send_and_recv_msgs(drv, msg, phy_info_handler, &result) == 0) { if (send_and_recv_msgs(drv, msg, phy_info_handler, &result) == 0) {
nl80211_set_regulatory_flags(drv, &result); nl80211_set_regulatory_flags(drv, &result);
return wpa_driver_nl80211_postprocess_modes(result.modes, return wpa_driver_nl80211_postprocess_modes(result.modes,
num_modes); num_modes);
} }
msg = NULL;
nla_put_failure:
nlmsg_free(msg);
return NULL; return NULL;
} }