Commit c0bea69d authored by Shay Drory's avatar Shay Drory Committed by Jakub Kicinski
Browse files

devlink: Validate port function request 



In order to avoid partial request processing, validate the request
before processing it.

Signed-off-by: default avatarShay Drory <shayd@nvidia.com>
Reviewed-by: default avatarJiri Pirko <jiri@nvidia.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent df268f6c

net/core/devlink.c

+23 −9
Original line number Diff line number Diff line
@@ -1632,11 +1632,6 @@ static int devlink_port_function_hw_addr_set(struct devlink_port *port, 
		}

	}



	if (!ops->port_function_hw_addr_set) {

		NL_SET_ERR_MSG_MOD(extack, "Port doesn't support function attributes");

		return -EOPNOTSUPP;

	}



	return ops->port_function_hw_addr_set(port, hw_addr, hw_addr_len,

					      extack);

}
@@ -1650,12 +1645,27 @@ static int devlink_port_fn_state_set(struct devlink_port *port, 


	state = nla_get_u8(attr);

	ops = port->devlink->ops;

	if (!ops->port_fn_state_set) {

		NL_SET_ERR_MSG_MOD(extack,

	return ops->port_fn_state_set(port, state, extack);

}



static int devlink_port_function_validate(struct devlink_port *devlink_port,

					  struct nlattr **tb,

					  struct netlink_ext_ack *extack)

{

	const struct devlink_ops *ops = devlink_port->devlink->ops;



	if (tb[DEVLINK_PORT_FUNCTION_ATTR_HW_ADDR] &&

	    !ops->port_function_hw_addr_set) {

		NL_SET_ERR_MSG_ATTR(extack, tb[DEVLINK_PORT_FUNCTION_ATTR_HW_ADDR],

				    "Port doesn't support function attributes");

		return -EOPNOTSUPP;

	}

	if (tb[DEVLINK_PORT_FN_ATTR_STATE] && !ops->port_fn_state_set) {

		NL_SET_ERR_MSG_ATTR(extack, tb[DEVLINK_PORT_FUNCTION_ATTR_HW_ADDR],

				    "Function does not support state setting");

		return -EOPNOTSUPP;

	}

	return ops->port_fn_state_set(port, state, extack);

	return 0;

}



static int devlink_port_function_set(struct devlink_port *port,
@@ -1672,6 +1682,10 @@ static int devlink_port_function_set(struct devlink_port *port, 
		return err;

	}



	err = devlink_port_function_validate(port, tb, extack);

	if (err)

		return err;



	attr = tb[DEVLINK_PORT_FUNCTION_ATTR_HW_ADDR];

	if (attr) {

		err = devlink_port_function_hw_addr_set(port, attr, extack);