Commit a6fbcdda authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'net-add-missing-netlink-policies' 



Jakub Kicinski says:

====================
net: add missing netlink policies

Recent one-off fixes motivated me to do some grepping for
more missing netlink attribute policies. I didn't manage
to even produce a KASAN splat with these, but it should
be possible with sufficient luck. All the missing policies
are pretty trivial (NLA_Uxx).

I've only tested the devlink patches, the rest compiles.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents ab124d58 6ba3da44

drivers/net/can/dev.c

+1 −0
Original line number Diff line number Diff line
@@ -883,6 +883,7 @@ static const struct nla_policy can_policy[IFLA_CAN_MAX + 1] = { 
				= { .len = sizeof(struct can_bittiming) },

	[IFLA_CAN_DATA_BITTIMING_CONST]

				= { .len = sizeof(struct can_bittiming_const) },

	[IFLA_CAN_TERMINATION]	= { .type = NLA_U16 },

};



static int can_validate(struct nlattr *tb[], struct nlattr *data[],

drivers/net/macsec.c

+1 −0
Original line number Diff line number Diff line
@@ -3342,6 +3342,7 @@ static const struct device_type macsec_type = { 


static const struct nla_policy macsec_rtnl_policy[IFLA_MACSEC_MAX + 1] = {

	[IFLA_MACSEC_SCI] = { .type = NLA_U64 },

	[IFLA_MACSEC_PORT] = { .type = NLA_U16 },

	[IFLA_MACSEC_ICV_LEN] = { .type = NLA_U8 },

	[IFLA_MACSEC_CIPHER_SUITE] = { .type = NLA_U64 },

	[IFLA_MACSEC_WINDOW] = { .type = NLA_U32 },

drivers/net/team/team.c

+2 −0
Original line number Diff line number Diff line
@@ -2240,6 +2240,8 @@ team_nl_option_policy[TEAM_ATTR_OPTION_MAX + 1] = { 
	[TEAM_ATTR_OPTION_CHANGED]		= { .type = NLA_FLAG },

	[TEAM_ATTR_OPTION_TYPE]			= { .type = NLA_U8 },

	[TEAM_ATTR_OPTION_DATA]			= { .type = NLA_BINARY },

	[TEAM_ATTR_OPTION_PORT_IFINDEX]		= { .type = NLA_U32 },

	[TEAM_ATTR_OPTION_ARRAY_INDEX]		= { .type = NLA_U32 },

};



static int team_nl_cmd_noop(struct sk_buff *skb, struct genl_info *info)

include/net/fib_rules.h

+1 −0
Original line number Diff line number Diff line
@@ -108,6 +108,7 @@ struct fib_rule_notifier_info { 
	[FRA_OIFNAME]	= { .type = NLA_STRING, .len = IFNAMSIZ - 1 }, \

	[FRA_PRIORITY]	= { .type = NLA_U32 }, \

	[FRA_FWMARK]	= { .type = NLA_U32 }, \

	[FRA_TUN_ID]	= { .type = NLA_U64 }, \

	[FRA_FWMASK]	= { .type = NLA_U32 }, \

	[FRA_TABLE]     = { .type = NLA_U32 }, \

	[FRA_SUPPRESS_PREFIXLEN] = { .type = NLA_U32 }, \

net/core/devlink.c

+21 −12
Original line number Diff line number Diff line
@@ -3352,34 +3352,41 @@ devlink_param_value_get_from_info(const struct devlink_param *param, 
				  struct genl_info *info,

				  union devlink_param_value *value)

{

	struct nlattr *param_data;

	int len;



	if (param->type != DEVLINK_PARAM_TYPE_BOOL &&

	    !info->attrs[DEVLINK_ATTR_PARAM_VALUE_DATA])

	param_data = info->attrs[DEVLINK_ATTR_PARAM_VALUE_DATA];



	if (param->type != DEVLINK_PARAM_TYPE_BOOL && !param_data)

		return -EINVAL;



	switch (param->type) {

	case DEVLINK_PARAM_TYPE_U8:

		value->vu8 = nla_get_u8(info->attrs[DEVLINK_ATTR_PARAM_VALUE_DATA]);

		if (nla_len(param_data) != sizeof(u8))

			return -EINVAL;

		value->vu8 = nla_get_u8(param_data);

		break;

	case DEVLINK_PARAM_TYPE_U16:

		value->vu16 = nla_get_u16(info->attrs[DEVLINK_ATTR_PARAM_VALUE_DATA]);

		if (nla_len(param_data) != sizeof(u16))

			return -EINVAL;

		value->vu16 = nla_get_u16(param_data);

		break;

	case DEVLINK_PARAM_TYPE_U32:

		value->vu32 = nla_get_u32(info->attrs[DEVLINK_ATTR_PARAM_VALUE_DATA]);

		if (nla_len(param_data) != sizeof(u32))

			return -EINVAL;

		value->vu32 = nla_get_u32(param_data);

		break;

	case DEVLINK_PARAM_TYPE_STRING:

		len = strnlen(nla_data(info->attrs[DEVLINK_ATTR_PARAM_VALUE_DATA]),

			      nla_len(info->attrs[DEVLINK_ATTR_PARAM_VALUE_DATA]));

		if (len == nla_len(info->attrs[DEVLINK_ATTR_PARAM_VALUE_DATA]) ||

		len = strnlen(nla_data(param_data), nla_len(param_data));

		if (len == nla_len(param_data) ||

		    len >= __DEVLINK_PARAM_MAX_STRING_VALUE)

			return -EINVAL;

		strcpy(value->vstr,

		       nla_data(info->attrs[DEVLINK_ATTR_PARAM_VALUE_DATA]));

		strcpy(value->vstr, nla_data(param_data));

		break;

	case DEVLINK_PARAM_TYPE_BOOL:

		value->vbool = info->attrs[DEVLINK_ATTR_PARAM_VALUE_DATA] ?

			       true : false;

		if (param_data && nla_len(param_data))

			return -EINVAL;

		value->vbool = nla_get_flag(param_data);

		break;

	}

	return 0;
@@ -5951,6 +5958,8 @@ static const struct nla_policy devlink_nl_policy[DEVLINK_ATTR_MAX + 1] = { 
	[DEVLINK_ATTR_PARAM_VALUE_CMODE] = { .type = NLA_U8 },

	[DEVLINK_ATTR_REGION_NAME] = { .type = NLA_NUL_STRING },

	[DEVLINK_ATTR_REGION_SNAPSHOT_ID] = { .type = NLA_U32 },

	[DEVLINK_ATTR_REGION_CHUNK_ADDR] = { .type = NLA_U64 },

	[DEVLINK_ATTR_REGION_CHUNK_LEN] = { .type = NLA_U64 },

	[DEVLINK_ATTR_HEALTH_REPORTER_NAME] = { .type = NLA_NUL_STRING },

	[DEVLINK_ATTR_HEALTH_REPORTER_GRACEFUL_PERIOD] = { .type = NLA_U64 },

	[DEVLINK_ATTR_HEALTH_REPORTER_AUTO_RECOVER] = { .type = NLA_U8 },

CRA Git | Maintained and supported by SUSTech CRA and CCSE