Skip to content

Commit e8d0325

Browse files
Volodymyr Mytnykdavem330
authored andcommitted
net: marvell: prestera: fix double free issue on err path
fix error path handling in prestera_bridge_port_join() that cases prestera driver to crash (see below). Trace: Internal error: Oops: 96000044 [#1] SMP Modules linked in: prestera_pci prestera uio_pdrv_genirq CPU: 1 PID: 881 Comm: ip Not tainted 5.15.0 #1 pstate: 60000005 (nZCv daif -PAN -UAO -TCO -DIT -SSBS BTYPE=--) pc : prestera_bridge_destroy+0x2c/0xb0 [prestera] lr : prestera_bridge_port_join+0x2cc/0x350 [prestera] sp : ffff800011a1b0f0 ... x2 : ffff000109ca6c80 x1 : dead000000000100 x0 : dead000000000122 Call trace: prestera_bridge_destroy+0x2c/0xb0 [prestera] prestera_bridge_port_join+0x2cc/0x350 [prestera] prestera_netdev_port_event.constprop.0+0x3c4/0x450 [prestera] prestera_netdev_event_handler+0xf4/0x110 [prestera] raw_notifier_call_chain+0x54/0x80 call_netdevice_notifiers_info+0x54/0xa0 __netdev_upper_dev_link+0x19c/0x380 Fixes: e1189d9 ("net: marvell: prestera: Add Switchdev driver implementation") Signed-off-by: Volodymyr Mytnyk <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 253e9b4 commit e8d0325

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

drivers/net/ethernet/marvell/prestera/prestera_switchdev.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -497,8 +497,8 @@ int prestera_bridge_port_join(struct net_device *br_dev,
497497

498498
br_port = prestera_bridge_port_add(bridge, port->dev);
499499
if (IS_ERR(br_port)) {
500-
err = PTR_ERR(br_port);
501-
goto err_brport_create;
500+
prestera_bridge_put(bridge);
501+
return PTR_ERR(br_port);
502502
}
503503

504504
err = switchdev_bridge_port_offload(br_port->dev, port->dev, NULL,
@@ -519,8 +519,6 @@ int prestera_bridge_port_join(struct net_device *br_dev,
519519
switchdev_bridge_port_unoffload(br_port->dev, NULL, NULL, NULL);
520520
err_switchdev_offload:
521521
prestera_bridge_port_put(br_port);
522-
err_brport_create:
523-
prestera_bridge_put(bridge);
524522
return err;
525523
}
526524

0 commit comments

Comments
 (0)