Skip to content

Commit 48794a8

Browse files
elfringmarckleinebudde
authored andcommitted
can: vxcan: Use common error handling code in vxcan_newlink()
Add a jump target so that a bit of exception handling can be better reused at the end of this function. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring <[email protected]> Acked-by: Oliver Hartkopp <[email protected]> Signed-off-by: Marc Kleine-Budde <[email protected]>
1 parent aa4f3c6 commit 48794a8

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

drivers/net/can/vxcan.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -227,10 +227,8 @@ static int vxcan_newlink(struct net *net, struct net_device *dev,
227227
netif_carrier_off(peer);
228228

229229
err = rtnl_configure_link(peer, ifmp);
230-
if (err < 0) {
231-
unregister_netdevice(peer);
232-
return err;
233-
}
230+
if (err < 0)
231+
goto unregister_network_device;
234232

235233
/* register first device */
236234
if (tb[IFLA_IFNAME])
@@ -239,10 +237,8 @@ static int vxcan_newlink(struct net *net, struct net_device *dev,
239237
snprintf(dev->name, IFNAMSIZ, DRV_NAME "%%d");
240238

241239
err = register_netdevice(dev);
242-
if (err < 0) {
243-
unregister_netdevice(peer);
244-
return err;
245-
}
240+
if (err < 0)
241+
goto unregister_network_device;
246242

247243
netif_carrier_off(dev);
248244

@@ -254,6 +250,10 @@ static int vxcan_newlink(struct net *net, struct net_device *dev,
254250
rcu_assign_pointer(priv->peer, dev);
255251

256252
return 0;
253+
254+
unregister_network_device:
255+
unregister_netdevice(peer);
256+
return err;
257257
}
258258

259259
static void vxcan_dellink(struct net_device *dev, struct list_head *head)

0 commit comments

Comments
 (0)