Skip to content

Commit

Permalink
ionic: cleanly release devlink instance
Browse files Browse the repository at this point in the history
[ Upstream commit c2255ff ]

The failure to register devlink will leave the system with dangled
devlink resource, which is not cleaned if devlink_port_register() fails.

In order to remove access to ".registered" field of struct devlink_port,
require both devlink_register and devlink_port_register to success and
check it through device pointer.

Fixes: fbfb803 ("ionic: Add hardware init and device commands")
Reviewed-by: Moshe Shemesh <moshe@nvidia.com>
Signed-off-by: Leon Romanovsky <leonro@nvidia.com>
Acked-by: Shannon Nelson <snelson@pensando.io>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
rleon authored and gregkh committed Sep 15, 2021
1 parent 203537f commit 83f7297
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions drivers/net/ethernet/pensando/ionic/ionic_devlink.c
Expand Up @@ -91,20 +91,20 @@ int ionic_devlink_register(struct ionic *ionic)
attrs.flavour = DEVLINK_PORT_FLAVOUR_PHYSICAL;
devlink_port_attrs_set(&ionic->dl_port, &attrs);
err = devlink_port_register(dl, &ionic->dl_port, 0);
if (err)
if (err) {
dev_err(ionic->dev, "devlink_port_register failed: %d\n", err);
else
devlink_port_type_eth_set(&ionic->dl_port,
ionic->lif->netdev);
devlink_unregister(dl);
return err;
}

return err;
devlink_port_type_eth_set(&ionic->dl_port, ionic->lif->netdev);
return 0;
}

void ionic_devlink_unregister(struct ionic *ionic)
{
struct devlink *dl = priv_to_devlink(ionic);

if (ionic->dl_port.registered)
devlink_port_unregister(&ionic->dl_port);
devlink_port_unregister(&ionic->dl_port);
devlink_unregister(dl);
}

0 comments on commit 83f7297

Please sign in to comment.