Commit 2da7cc7d authored by Lorenzo Bianconi's avatar Lorenzo Bianconi Committed by Felix Fietkau

mt76: mt76u: fix a possible memory leak in mt76u_init

Remove usb workqueue if mt76u_set_endpoints fails.

Fixes: 284efb47 ("mt76: mt76u: rely on a dedicated stats workqueue")
Signed-off-by: default avatarLorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent 44e8f8ef
...@@ -1157,6 +1157,7 @@ int mt76u_init(struct mt76_dev *dev, ...@@ -1157,6 +1157,7 @@ int mt76u_init(struct mt76_dev *dev,
}; };
struct usb_device *udev = interface_to_usbdev(intf); struct usb_device *udev = interface_to_usbdev(intf);
struct mt76_usb *usb = &dev->usb; struct mt76_usb *usb = &dev->usb;
int err = -ENOMEM;
mt76u_ops.rr = ext ? mt76u_rr_ext : mt76u_rr; mt76u_ops.rr = ext ? mt76u_rr_ext : mt76u_rr;
mt76u_ops.wr = ext ? mt76u_wr_ext : mt76u_wr; mt76u_ops.wr = ext ? mt76u_wr_ext : mt76u_wr;
...@@ -1176,10 +1177,8 @@ int mt76u_init(struct mt76_dev *dev, ...@@ -1176,10 +1177,8 @@ int mt76u_init(struct mt76_dev *dev,
usb->data_len = 32; usb->data_len = 32;
usb->data = devm_kmalloc(dev->dev, usb->data_len, GFP_KERNEL); usb->data = devm_kmalloc(dev->dev, usb->data_len, GFP_KERNEL);
if (!usb->data) { if (!usb->data)
mt76u_deinit(dev); goto error;
return -ENOMEM;
}
mutex_init(&usb->usb_ctrl_mtx); mutex_init(&usb->usb_ctrl_mtx);
dev->bus = &mt76u_ops; dev->bus = &mt76u_ops;
...@@ -1189,7 +1188,15 @@ int mt76u_init(struct mt76_dev *dev, ...@@ -1189,7 +1188,15 @@ int mt76u_init(struct mt76_dev *dev,
usb->sg_en = mt76u_check_sg(dev); usb->sg_en = mt76u_check_sg(dev);
return mt76u_set_endpoints(intf, usb); err = mt76u_set_endpoints(intf, usb);
if (err < 0)
goto error;
return 0;
error:
mt76u_deinit(dev);
return err;
} }
EXPORT_SYMBOL_GPL(mt76u_init); EXPORT_SYMBOL_GPL(mt76u_init);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment