devlink: Enhance policy to validate port type input value

Use range checking facility of nla_policy to validate port type
attribute input value is valid or not.

Signed-off-by: Parav Pandit <parav@nvidia.com>
Reviewed-by: Jiri Pirko <jiri@nvidia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/core/devlink.c b/net/core/devlink.c
index b0b3af3..ac32b67 100644 (file)
--- a/net/core/devlink.c
+++ b/net/core/devlink.c
@@ -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 },