devlink: disallow reload operation during device cleanup
Subsystems (6)
Jiri Pirko
maintainerPATCH 1/1 devlink: disallow reload operation during device cleanup
From: Jiri Pirko <[email protected]>
There is a race between driver code that does setup/cleanup of device and devlink reload operation that in some drivers works with the same code. Use after free could we easily obtained by running:
while true; do
echo 10 > /sys/bus/netdevsim/new_device devlink dev reload netdevsim/netdevsim10 & echo 10 > /sys/bus/netdevsim/del_device
done
Fix this by enabling reload only after setup of device is complete and disabling it at the beginning of the cleanup process.
--- drivers/net/ethernet/mellanox/mlx4/main.c | 3 ++ drivers/net/ethernet/mellanox/mlxsw/core.c | 6 +++- drivers/net/netdevsim/dev.c | 3 ++ include/net/devlink.h | 7 ++-- net/core/devlink.c | 42 +++++++++++++++++++++- 5 files changed, 57 insertions(+), 4 deletions(-)
drivers/net/ethernet/mellanox/mlx4/main.c +3 -0
@@ -4015,6 +4015,7 @@ static int mlx4_init_one(struct pci_dev *pdev, const struct pci_device_id *id) goto err_params_unregister;devlink_params_publish (devlink); +devlink_reload_enable (devlink);pci_save_state (pdev);return 0 ;
@@ -4126,6 +4127,8 @@ static void mlx4_remove_one(struct pci_dev *pdev)struct devlink *devlink =priv_to_devlink (priv);int active_vfs =0 ; +devlink_reload_disable (devlink); +if (mlx4_is_slave (dev)) persist->interface_state |=MLX4_INTERFACE_STATE_NOWAIT ;
drivers/net/ethernet/mellanox/mlxsw/core.c +5 -1
@@ -1198,8 +1198,10 @@ __mlxsw_core_bus_device_register(const struct mlxsw_bus_info *mlxsw_bus_info,if (err) goto err_thermal_init; -if (mlxsw_driver->params_register) +if (mlxsw_driver->params_register) {devlink_params_publish (devlink); +devlink_reload_enable (devlink); + }return 0 ;
@@ -1263,6 +1265,8 @@ void mlxsw_core_bus_device_unregister(struct mlxsw_core *mlxsw_core, {struct devlink *devlink =priv_to_devlink (mlxsw_core); +if (!reload) +devlink_reload_disable (devlink);if (devlink_is_reload_failed (devlink)) {if (!reload)/* Only the parts that were not de-initialized in the
drivers/net/netdevsim/dev.c +3 -0
@@ -820,6 +820,7 @@ int nsim_dev_probe(struct nsim_bus_dev *nsim_bus_dev) goto err_bpf_dev_exit;devlink_params_publish (devlink); +devlink_reload_enable (devlink);return 0 ; err_bpf_dev_exit:
@@ -865,6 +866,8 @@ void nsim_dev_remove(struct nsim_bus_dev *nsim_bus_dev)struct nsim_dev *nsim_dev =dev_get_drvdata (&nsim_bus_dev->dev);struct devlink *devlink =priv_to_devlink (nsim_dev); +devlink_reload_disable (devlink); +nsim_dev_reload_destroy (nsim_dev);nsim_bpf_dev_exit (nsim_dev);
include/net/devlink.h +5 -2
@@ -38,8 +38,9 @@ struct devlink {struct device *dev;possible_net_t _net;struct mutex lock; -bool reload_failed; -bool registered; + u8 reload_failed:1, + reload_enabled:1, + registered:1;char priv[0 ]__aligned(NETDEV_ALIGN) ; };
@@ -824,6 +825,8 @@ void devlink_net_set(struct devlink *devlink, struct net *net);struct devlink *devlink_alloc (const struct devlink_ops *ops,size_t priv_size);int devlink_register (struct devlink *devlink,struct device *dev);void devlink_unregister (struct devlink *devlink); +void devlink_reload_enable (struct devlink *devlink); +void devlink_reload_disable (struct devlink *devlink);void devlink_free (struct devlink *devlink); int devlink_port_register(struct devlink *devlink, struct devlink_port *devlink_port,
net/core/devlink.c +41 -1
66 lines not on this page · raw message
Signature · 1 line
2.21.0
Quoted 12 lines · Jiri Pirko
From: Jiri Pirko <[email protected]>
There is a race between driver code that does setup/cleanup of device and devlink reload operation that in some drivers works with the same code. Use after free could we easily obtained by running:
while true; do
echo 10 >/sys/bus/netdevsim/new_devicedevlink dev reload netdevsim/netdevsim10 & echo 10 >/sys/bus/netdevsim/del_device
done
Quoted 6 lines
Fix this by enabling reload only after setup of device is complete and disabling it at the beginning of the cleanup process.
Reported-by Ido Schimmel <[email protected]>Fixes 2d8dc5bbf4e7 ("devlink: Add support for reload")Signed-off-by Jiri Pirko <[email protected]>
I have no better ideas, so:
From: Jiri Pirko <[email protected]>
Date: Fri, 8 Nov 2019 21:42:43 +0100
Quoted 12 lines
From: Jiri Pirko <[email protected]>
There is a race between driver code that does setup/cleanup of device and devlink reload operation that in some drivers works with the same code. Use after free could we easily obtained by running:
while true; do
echo 10 >/sys/bus/netdevsim/new_devicedevlink dev reload netdevsim/netdevsim10 & echo 10 >/sys/bus/netdevsim/del_device
done
Quoted 6 lines
Fix this by enabling reload only after setup of device is complete and disabling it at the beginning of the cleanup process.
Reported-by Ido Schimmel <[email protected]>Fixes 2d8dc5bbf4e7 ("devlink: Add support for reload")Signed-off-by Jiri Pirko <[email protected]>
Applied.