Commit 79604c5d authored by Parav Pandit's avatar Parav Pandit Committed by David S. Miller
Browse files

devlink: Fix per port reporter fields initialization 



Cited patch in fixes tag initializes reporters_list and reporters_lock
of a devlink port after devlink port is added to the list. Once port
is added to the list, devlink_nl_cmd_health_reporter_get_dumpit()
can access the uninitialized mutex and reporters list head.
Fix it by initializing port reporters field before adding port to the
list.

Fixes: f4f54166 ("devlink: Implement devlink health reporters on per-port basis")
Signed-off-by: default avatarParav Pandit <parav@nvidia.com>
Reviewed-by: default avatarJiri Pirko <jiri@nvidia.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 507ebe64

net/core/devlink.c

+4 −4
Original line number Diff line number Diff line
@@ -7555,11 +7555,11 @@ int devlink_port_register(struct devlink *devlink, 
	devlink_port->index = port_index;

	devlink_port->registered = true;

	spin_lock_init(&devlink_port->type_lock);

	INIT_LIST_HEAD(&devlink_port->reporter_list);

	mutex_init(&devlink_port->reporters_lock);

	list_add_tail(&devlink_port->list, &devlink->port_list);

	INIT_LIST_HEAD(&devlink_port->param_list);

	mutex_unlock(&devlink->lock);

	INIT_LIST_HEAD(&devlink_port->reporter_list);

	mutex_init(&devlink_port->reporters_lock);

	INIT_DELAYED_WORK(&devlink_port->type_warn_dw, &devlink_port_type_warn);

	devlink_port_type_warn_schedule(devlink_port);

	devlink_port_notify(devlink_port, DEVLINK_CMD_PORT_NEW);
@@ -7576,13 +7576,13 @@ void devlink_port_unregister(struct devlink_port *devlink_port) 
{

	struct devlink *devlink = devlink_port->devlink;



	WARN_ON(!list_empty(&devlink_port->reporter_list));

	mutex_destroy(&devlink_port->reporters_lock);

	devlink_port_type_warn_cancel(devlink_port);

	devlink_port_notify(devlink_port, DEVLINK_CMD_PORT_DEL);

	mutex_lock(&devlink->lock);

	list_del(&devlink_port->list);

	mutex_unlock(&devlink->lock);

	WARN_ON(!list_empty(&devlink_port->reporter_list));

	mutex_destroy(&devlink_port->reporters_lock);

}

EXPORT_SYMBOL_GPL(devlink_port_unregister);

CRA Git | Maintained and supported by SUSTech CRA and CCSE