Skip to content

Commit c2255ff

Browse files
rleondavem330
authored andcommitted
ionic: cleanly release devlink instance
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>
1 parent 58d913a commit c2255ff

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

drivers/net/ethernet/pensando/ionic/ionic_devlink.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -91,20 +91,20 @@ int ionic_devlink_register(struct ionic *ionic)
9191
attrs.flavour = DEVLINK_PORT_FLAVOUR_PHYSICAL;
9292
devlink_port_attrs_set(&ionic->dl_port, &attrs);
9393
err = devlink_port_register(dl, &ionic->dl_port, 0);
94-
if (err)
94+
if (err) {
9595
dev_err(ionic->dev, "devlink_port_register failed: %d\n", err);
96-
else
97-
devlink_port_type_eth_set(&ionic->dl_port,
98-
ionic->lif->netdev);
96+
devlink_unregister(dl);
97+
return err;
98+
}
9999

100-
return err;
100+
devlink_port_type_eth_set(&ionic->dl_port, ionic->lif->netdev);
101+
return 0;
101102
}
102103

103104
void ionic_devlink_unregister(struct ionic *ionic)
104105
{
105106
struct devlink *dl = priv_to_devlink(ionic);
106107

107-
if (ionic->dl_port.registered)
108-
devlink_port_unregister(&ionic->dl_port);
108+
devlink_port_unregister(&ionic->dl_port);
109109
devlink_unregister(dl);
110110
}

0 commit comments

Comments
 (0)