netlink: make validation_data const (48fde90a) · Commits · 戴 / test

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>

include/net/netlink.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -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 }

lib/nlattr.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -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 /

Admin message