Commit a1193be8 authored by Simon Wunderlich's avatar Simon Wunderlich Committed by Johannes Berg

nl80211: use attributes to parse beacons

only the attributes are required and not the whole netlink info, as the
function accesses the attributes only anyway. This makes it easier to
parse nested beacon IEs later.
Signed-off-by: default avatarSimon Wunderlich <siwu@hrz.tu-chemnitz.de>
Signed-off-by: default avatarMathias Kretschmer <mathias.kretschmer@fokus.fraunhofer.de>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 38745c74
...@@ -2882,61 +2882,58 @@ static int nl80211_set_mac_acl(struct sk_buff *skb, struct genl_info *info) ...@@ -2882,61 +2882,58 @@ static int nl80211_set_mac_acl(struct sk_buff *skb, struct genl_info *info)
return err; return err;
} }
static int nl80211_parse_beacon(struct genl_info *info, static int nl80211_parse_beacon(struct nlattr *attrs[],
struct cfg80211_beacon_data *bcn) struct cfg80211_beacon_data *bcn)
{ {
bool haveinfo = false; bool haveinfo = false;
if (!is_valid_ie_attr(info->attrs[NL80211_ATTR_BEACON_TAIL]) || if (!is_valid_ie_attr(attrs[NL80211_ATTR_BEACON_TAIL]) ||
!is_valid_ie_attr(info->attrs[NL80211_ATTR_IE]) || !is_valid_ie_attr(attrs[NL80211_ATTR_IE]) ||
!is_valid_ie_attr(info->attrs[NL80211_ATTR_IE_PROBE_RESP]) || !is_valid_ie_attr(attrs[NL80211_ATTR_IE_PROBE_RESP]) ||
!is_valid_ie_attr(info->attrs[NL80211_ATTR_IE_ASSOC_RESP])) !is_valid_ie_attr(attrs[NL80211_ATTR_IE_ASSOC_RESP]))
return -EINVAL; return -EINVAL;
memset(bcn, 0, sizeof(*bcn)); memset(bcn, 0, sizeof(*bcn));
if (info->attrs[NL80211_ATTR_BEACON_HEAD]) { if (attrs[NL80211_ATTR_BEACON_HEAD]) {
bcn->head = nla_data(info->attrs[NL80211_ATTR_BEACON_HEAD]); bcn->head = nla_data(attrs[NL80211_ATTR_BEACON_HEAD]);
bcn->head_len = nla_len(info->attrs[NL80211_ATTR_BEACON_HEAD]); bcn->head_len = nla_len(attrs[NL80211_ATTR_BEACON_HEAD]);
if (!bcn->head_len) if (!bcn->head_len)
return -EINVAL; return -EINVAL;
haveinfo = true; haveinfo = true;
} }
if (info->attrs[NL80211_ATTR_BEACON_TAIL]) { if (attrs[NL80211_ATTR_BEACON_TAIL]) {
bcn->tail = nla_data(info->attrs[NL80211_ATTR_BEACON_TAIL]); bcn->tail = nla_data(attrs[NL80211_ATTR_BEACON_TAIL]);
bcn->tail_len = bcn->tail_len = nla_len(attrs[NL80211_ATTR_BEACON_TAIL]);
nla_len(info->attrs[NL80211_ATTR_BEACON_TAIL]);
haveinfo = true; haveinfo = true;
} }
if (!haveinfo) if (!haveinfo)
return -EINVAL; return -EINVAL;
if (info->attrs[NL80211_ATTR_IE]) { if (attrs[NL80211_ATTR_IE]) {
bcn->beacon_ies = nla_data(info->attrs[NL80211_ATTR_IE]); bcn->beacon_ies = nla_data(attrs[NL80211_ATTR_IE]);
bcn->beacon_ies_len = nla_len(info->attrs[NL80211_ATTR_IE]); bcn->beacon_ies_len = nla_len(attrs[NL80211_ATTR_IE]);
} }
if (info->attrs[NL80211_ATTR_IE_PROBE_RESP]) { if (attrs[NL80211_ATTR_IE_PROBE_RESP]) {
bcn->proberesp_ies = bcn->proberesp_ies =
nla_data(info->attrs[NL80211_ATTR_IE_PROBE_RESP]); nla_data(attrs[NL80211_ATTR_IE_PROBE_RESP]);
bcn->proberesp_ies_len = bcn->proberesp_ies_len =
nla_len(info->attrs[NL80211_ATTR_IE_PROBE_RESP]); nla_len(attrs[NL80211_ATTR_IE_PROBE_RESP]);
} }
if (info->attrs[NL80211_ATTR_IE_ASSOC_RESP]) { if (attrs[NL80211_ATTR_IE_ASSOC_RESP]) {
bcn->assocresp_ies = bcn->assocresp_ies =
nla_data(info->attrs[NL80211_ATTR_IE_ASSOC_RESP]); nla_data(attrs[NL80211_ATTR_IE_ASSOC_RESP]);
bcn->assocresp_ies_len = bcn->assocresp_ies_len =
nla_len(info->attrs[NL80211_ATTR_IE_ASSOC_RESP]); nla_len(attrs[NL80211_ATTR_IE_ASSOC_RESP]);
} }
if (info->attrs[NL80211_ATTR_PROBE_RESP]) { if (attrs[NL80211_ATTR_PROBE_RESP]) {
bcn->probe_resp = bcn->probe_resp = nla_data(attrs[NL80211_ATTR_PROBE_RESP]);
nla_data(info->attrs[NL80211_ATTR_PROBE_RESP]); bcn->probe_resp_len = nla_len(attrs[NL80211_ATTR_PROBE_RESP]);
bcn->probe_resp_len =
nla_len(info->attrs[NL80211_ATTR_PROBE_RESP]);
} }
return 0; return 0;
...@@ -3015,7 +3012,7 @@ static int nl80211_start_ap(struct sk_buff *skb, struct genl_info *info) ...@@ -3015,7 +3012,7 @@ static int nl80211_start_ap(struct sk_buff *skb, struct genl_info *info)
!info->attrs[NL80211_ATTR_BEACON_HEAD]) !info->attrs[NL80211_ATTR_BEACON_HEAD])
return -EINVAL; return -EINVAL;
err = nl80211_parse_beacon(info, &params.beacon); err = nl80211_parse_beacon(info->attrs, &params.beacon);
if (err) if (err)
return err; return err;
...@@ -3167,7 +3164,7 @@ static int nl80211_set_beacon(struct sk_buff *skb, struct genl_info *info) ...@@ -3167,7 +3164,7 @@ static int nl80211_set_beacon(struct sk_buff *skb, struct genl_info *info)
if (!wdev->beacon_interval) if (!wdev->beacon_interval)
return -EINVAL; return -EINVAL;
err = nl80211_parse_beacon(info, &params); err = nl80211_parse_beacon(info->attrs, &params);
if (err) if (err)
return err; return err;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment