8cb081746c
We currently have two levels of strict validation:
1) liberal (default)
- undefined (type >= max) & NLA_UNSPEC attributes accepted
- attribute length >= expected accepted
- garbage at end of message accepted
2) strict (opt-in)
- NLA_UNSPEC attributes accepted
- attribute length >= expected accepted
Split out parsing strictness into four different options:
* TRAILING - check that there's no trailing data after parsing
attributes (in message or nested)
* MAXTYPE - reject attrs > max known type
* UNSPEC - reject attributes with NLA_UNSPEC policy entries
* STRICT_ATTRS - strictly validate attribute size
The default for future things should be *everything*.
The current *_strict() is a combination of TRAILING and MAXTYPE,
and is renamed to _deprecated_strict().
The current regular parsing has none of this, and is renamed to
*_parse_deprecated().
Additionally it allows us to selectively set one of the new flags
even on old policies. Notably, the UNSPEC flag could be useful in
this case, since it can be arranged (by filling in the policy) to
not be an incompatible userspace ABI change, but would then going
forward prevent forgetting attribute entries. Similar can apply
to the POLICY flag.
We end up with the following renames:
* nla_parse -> nla_parse_deprecated
* nla_parse_strict -> nla_parse_deprecated_strict
* nlmsg_parse -> nlmsg_parse_deprecated
* nlmsg_parse_strict -> nlmsg_parse_deprecated_strict
* nla_parse_nested -> nla_parse_nested_deprecated
* nla_validate_nested -> nla_validate_nested_deprecated
Using spatch, of course:
@@
expression TB, MAX, HEAD, LEN, POL, EXT;
@@
-nla_parse(TB, MAX, HEAD, LEN, POL, EXT)
+nla_parse_deprecated(TB, MAX, HEAD, LEN, POL, EXT)
@@
expression NLH, HDRLEN, TB, MAX, POL, EXT;
@@
-nlmsg_parse(NLH, HDRLEN, TB, MAX, POL, EXT)
+nlmsg_parse_deprecated(NLH, HDRLEN, TB, MAX, POL, EXT)
@@
expression NLH, HDRLEN, TB, MAX, POL, EXT;
@@
-nlmsg_parse_strict(NLH, HDRLEN, TB, MAX, POL, EXT)
+nlmsg_parse_deprecated_strict(NLH, HDRLEN, TB, MAX, POL, EXT)
@@
expression TB, MAX, NLA, POL, EXT;
@@
-nla_parse_nested(TB, MAX, NLA, POL, EXT)
+nla_parse_nested_deprecated(TB, MAX, NLA, POL, EXT)
@@
expression START, MAX, POL, EXT;
@@
-nla_validate_nested(START, MAX, POL, EXT)
+nla_validate_nested_deprecated(START, MAX, POL, EXT)
@@
expression NLH, HDRLEN, MAX, POL, EXT;
@@
-nlmsg_validate(NLH, HDRLEN, MAX, POL, EXT)
+nlmsg_validate_deprecated(NLH, HDRLEN, MAX, POL, EXT)
For this patch, don't actually add the strict, non-renamed versions
yet so that it breaks compile if I get it wrong.
Also, while at it, make nla_validate and nla_parse go down to a
common __nla_validate_parse() function to avoid code duplication.
Ultimately, this allows us to have very strict validation for every
new caller of nla_parse()/nlmsg_parse() etc as re-introduced in the
next patch, while existing things will continue to work as is.
In effect then, this adds fully strict validation for any new command.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
102 lines
2.7 KiB
C
102 lines
2.7 KiB
C
/*
|
|
* Copyright (c) 2010-2011 Atheros Communications Inc.
|
|
* Copyright (c) 2011 Qualcomm Atheros, Inc.
|
|
*
|
|
* Permission to use, copy, modify, and/or distribute this software for any
|
|
* purpose with or without fee is hereby granted, provided that the above
|
|
* copyright notice and this permission notice appear in all copies.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
|
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
|
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
|
|
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
|
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
|
|
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
|
|
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
|
*/
|
|
|
|
#include "testmode.h"
|
|
#include "debug.h"
|
|
|
|
#include <net/netlink.h>
|
|
|
|
enum ath6kl_tm_attr {
|
|
__ATH6KL_TM_ATTR_INVALID = 0,
|
|
ATH6KL_TM_ATTR_CMD = 1,
|
|
ATH6KL_TM_ATTR_DATA = 2,
|
|
|
|
/* keep last */
|
|
__ATH6KL_TM_ATTR_AFTER_LAST,
|
|
ATH6KL_TM_ATTR_MAX = __ATH6KL_TM_ATTR_AFTER_LAST - 1,
|
|
};
|
|
|
|
enum ath6kl_tm_cmd {
|
|
ATH6KL_TM_CMD_TCMD = 0,
|
|
ATH6KL_TM_CMD_RX_REPORT = 1, /* not used anymore */
|
|
};
|
|
|
|
#define ATH6KL_TM_DATA_MAX_LEN 5000
|
|
|
|
static const struct nla_policy ath6kl_tm_policy[ATH6KL_TM_ATTR_MAX + 1] = {
|
|
[ATH6KL_TM_ATTR_CMD] = { .type = NLA_U32 },
|
|
[ATH6KL_TM_ATTR_DATA] = { .type = NLA_BINARY,
|
|
.len = ATH6KL_TM_DATA_MAX_LEN },
|
|
};
|
|
|
|
void ath6kl_tm_rx_event(struct ath6kl *ar, void *buf, size_t buf_len)
|
|
{
|
|
struct sk_buff *skb;
|
|
|
|
if (!buf || buf_len == 0)
|
|
return;
|
|
|
|
skb = cfg80211_testmode_alloc_event_skb(ar->wiphy, buf_len, GFP_KERNEL);
|
|
if (!skb) {
|
|
ath6kl_warn("failed to allocate testmode rx skb!\n");
|
|
return;
|
|
}
|
|
if (nla_put_u32(skb, ATH6KL_TM_ATTR_CMD, ATH6KL_TM_CMD_TCMD) ||
|
|
nla_put(skb, ATH6KL_TM_ATTR_DATA, buf_len, buf))
|
|
goto nla_put_failure;
|
|
cfg80211_testmode_event(skb, GFP_KERNEL);
|
|
return;
|
|
|
|
nla_put_failure:
|
|
kfree_skb(skb);
|
|
ath6kl_warn("nla_put failed on testmode rx skb!\n");
|
|
}
|
|
|
|
int ath6kl_tm_cmd(struct wiphy *wiphy, struct wireless_dev *wdev,
|
|
void *data, int len)
|
|
{
|
|
struct ath6kl *ar = wiphy_priv(wiphy);
|
|
struct nlattr *tb[ATH6KL_TM_ATTR_MAX + 1];
|
|
int err, buf_len;
|
|
void *buf;
|
|
|
|
err = nla_parse_deprecated(tb, ATH6KL_TM_ATTR_MAX, data, len,
|
|
ath6kl_tm_policy, NULL);
|
|
if (err)
|
|
return err;
|
|
|
|
if (!tb[ATH6KL_TM_ATTR_CMD])
|
|
return -EINVAL;
|
|
|
|
switch (nla_get_u32(tb[ATH6KL_TM_ATTR_CMD])) {
|
|
case ATH6KL_TM_CMD_TCMD:
|
|
if (!tb[ATH6KL_TM_ATTR_DATA])
|
|
return -EINVAL;
|
|
|
|
buf = nla_data(tb[ATH6KL_TM_ATTR_DATA]);
|
|
buf_len = nla_len(tb[ATH6KL_TM_ATTR_DATA]);
|
|
|
|
ath6kl_wmi_test_cmd(ar->wmi, buf, buf_len);
|
|
|
|
return 0;
|
|
|
|
break;
|
|
case ATH6KL_TM_CMD_RX_REPORT:
|
|
default:
|
|
return -EOPNOTSUPP;
|
|
}
|
|
}
|