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

Merge branch 'devlink-Use-nla_policy-to-validate-range' 



Parav Pandit says:

====================
devlink: Use nla_policy to validate range

This two small patches uses nla_policy to validate user specified
fields are in valid range or not.

Patch summary:
Patch-1 checks the range of eswitch mode field
Patch-2 checks for the port type field. It eliminates a check in
code by using nla policy infrastructure.
====================

Reviewed-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 3ab0a7a0 c49a9440

net/core/devlink.c

+4 −4
Original line number Diff line number Diff line
@@ -811,8 +811,6 @@ static int devlink_port_type_set(struct devlink *devlink, 
	int err;



	if (devlink->ops->port_type_set) {

		if (port_type == DEVLINK_PORT_TYPE_NOTSET)

			return -EINVAL;

		if (port_type == devlink_port->type)

			return 0;

		err = devlink->ops->port_type_set(devlink_port, port_type);
@@ -7055,7 +7053,8 @@ static const struct nla_policy devlink_nl_policy[DEVLINK_ATTR_MAX + 1] = { 
	[DEVLINK_ATTR_BUS_NAME] = { .type = NLA_NUL_STRING },

	[DEVLINK_ATTR_DEV_NAME] = { .type = NLA_NUL_STRING },

	[DEVLINK_ATTR_PORT_INDEX] = { .type = NLA_U32 },

	[DEVLINK_ATTR_PORT_TYPE] = { .type = NLA_U16 },

	[DEVLINK_ATTR_PORT_TYPE] = NLA_POLICY_RANGE(NLA_U16, DEVLINK_PORT_TYPE_AUTO,

						    DEVLINK_PORT_TYPE_IB),

	[DEVLINK_ATTR_PORT_SPLIT_COUNT] = { .type = NLA_U32 },

	[DEVLINK_ATTR_SB_INDEX] = { .type = NLA_U32 },

	[DEVLINK_ATTR_SB_POOL_INDEX] = { .type = NLA_U16 },
@@ -7064,7 +7063,8 @@ static const struct nla_policy devlink_nl_policy[DEVLINK_ATTR_MAX + 1] = { 
	[DEVLINK_ATTR_SB_POOL_THRESHOLD_TYPE] = { .type = NLA_U8 },

	[DEVLINK_ATTR_SB_THRESHOLD] = { .type = NLA_U32 },

	[DEVLINK_ATTR_SB_TC_INDEX] = { .type = NLA_U16 },

	[DEVLINK_ATTR_ESWITCH_MODE] = { .type = NLA_U16 },

	[DEVLINK_ATTR_ESWITCH_MODE] = NLA_POLICY_RANGE(NLA_U16, DEVLINK_ESWITCH_MODE_LEGACY,

						       DEVLINK_ESWITCH_MODE_SWITCHDEV),

	[DEVLINK_ATTR_ESWITCH_INLINE_MODE] = { .type = NLA_U8 },

	[DEVLINK_ATTR_ESWITCH_ENCAP_MODE] = { .type = NLA_U8 },

	[DEVLINK_ATTR_DPIPE_TABLE_NAME] = { .type = NLA_NUL_STRING },