diff options
| author |   Johannes Berg <johannes.berg@intel.com> | 2018-09-26 11:15:31 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2018-09-28 10:24:39 -0700 |
| commit | 48fde90a78f8c67e2bec5061f9725fe363519feb (patch) | |
| tree | 9a1c59ea9061b11a42fc02b9b8749404431e757b | |
| parent | netlink: remove NLA_NESTED_COMPAT (diff) | |
| download | linux-dev-48fde90a78f8c67e2bec5061f9725fe363519feb.tar.xz linux-dev-48fde90a78f8c67e2bec5061f9725fe363519feb.zip | |
netlink: make validation_data const
The validation data is only used within the policy that
should usually already be const, and isn't changed in any
code that uses it. Therefore, make the validation_data
pointer const.
While at it, remove the duplicate variable in the bitfield
validation that I'd otherwise have to change to const.
Reviewed-by: David Ahern <dsahern@gmail.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | include/net/netlink.h | 2 | ||||
| -rw-r--r-- | lib/nlattr.c | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/include/net/netlink.h b/include/net/netlink.h index b680fe365e91..0d698215d4d9 100644 --- a/include/net/netlink.h +++ b/include/net/netlink.h @@ -237,7 +237,7 @@ enum { struct nla_policy { u16 type; u16 len; - void *validation_data; + const void *validation_data; }; #define NLA_POLICY_EXACT_LEN(_len) { .type = NLA_EXACT_LEN, .len = _len } diff --git a/lib/nlattr.c b/lib/nlattr.c index 120ad569e13d..e2e5b38394d5 100644 --- a/lib/nlattr.c +++ b/lib/nlattr.c @@ -45,12 +45,11 @@ static const u8 nla_attr_minlen[NLA_TYPE_MAX+1] = { }; static int validate_nla_bitfield32(const struct nlattr *nla, - u32 *valid_flags_allowed) + const u32 *valid_flags_mask) { const struct nla_bitfield32 *bf = nla_data(nla); - u32 *valid_flags_mask = valid_flags_allowed; - if (!valid_flags_allowed) + if (!valid_flags_mask) return -EINVAL; /*disallow invalid bit selector */ |