mirror of https://gitee.com/openkylin/linux.git
lan78xx: USB fast connect/disconnect crash fix
USB fast connect/disconnect crash fix When USB plugged/unplugged at fast rate, lan78xx_mdio_init() in lan78xx_bind() failing case is not handled. Whenever lan78xx_mdio_init() failed, dev->mdiobus will be freed, however since lan78xx_bind() not consider as error and try to proceed for further initialization in lan78xx_probe() which leads system hung/crash. Also when register_netdev() failed, netdev is freed without calling lan78xx_unbind(). Hence halting the failed cases right manner fixes the system crash/hung issue. Signed-off-by: Nisar Sayed <Nisar.Sayed@microchip.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
12c5d0c048
commit
fb52c3b597
|
@ -2858,13 +2858,13 @@ static int lan78xx_bind(struct lan78xx_net *dev, struct usb_interface *intf)
|
|||
/* Init all registers */
|
||||
ret = lan78xx_reset(dev);
|
||||
|
||||
lan78xx_mdio_init(dev);
|
||||
ret = lan78xx_mdio_init(dev);
|
||||
|
||||
dev->net->flags |= IFF_MULTICAST;
|
||||
|
||||
pdata->wol = WAKE_MAGIC;
|
||||
|
||||
return 0;
|
||||
return ret;
|
||||
}
|
||||
|
||||
static void lan78xx_unbind(struct lan78xx_net *dev, struct usb_interface *intf)
|
||||
|
@ -3525,11 +3525,11 @@ static int lan78xx_probe(struct usb_interface *intf,
|
|||
udev = interface_to_usbdev(intf);
|
||||
udev = usb_get_dev(udev);
|
||||
|
||||
ret = -ENOMEM;
|
||||
netdev = alloc_etherdev(sizeof(struct lan78xx_net));
|
||||
if (!netdev) {
|
||||
dev_err(&intf->dev, "Error: OOM\n");
|
||||
goto out1;
|
||||
dev_err(&intf->dev, "Error: OOM\n");
|
||||
ret = -ENOMEM;
|
||||
goto out1;
|
||||
}
|
||||
|
||||
/* netdev_printk() needs this */
|
||||
|
@ -3610,7 +3610,7 @@ static int lan78xx_probe(struct usb_interface *intf,
|
|||
ret = register_netdev(netdev);
|
||||
if (ret != 0) {
|
||||
netif_err(dev, probe, netdev, "couldn't register the device\n");
|
||||
goto out2;
|
||||
goto out3;
|
||||
}
|
||||
|
||||
usb_set_intfdata(intf, dev);
|
||||
|
|
Loading…
Reference in New Issue