Unverified Commit 808cdaaa authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!14542 net: usb: lan78xx: Fix double free issue with interrupt buffer allocation 

Merge Pull Request from: @ci-robot 
 
PR sync from: Zicheng Qu <quzicheng@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/YXUCULZTYZWKL4VBII3FNXON7O4Q36ZM/ 
 
https://gitee.com/src-openeuler/kernel/issues/IBEAEY 
 
Link:https://gitee.com/openeuler/kernel/pulls/14542

 

Reviewed-by: default avatarZhang Peng <zhangpeng362@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 99e9f720 bb65a0fa

drivers/net/usb/lan78xx.c

+14 −15
Original line number Diff line number Diff line
@@ -4414,29 +4414,30 @@ static int lan78xx_probe(struct usb_interface *intf, 


	period = ep_intr->desc.bInterval;

	maxp = usb_maxpacket(dev->udev, dev->pipe_intr);

	buf = kmalloc(maxp, GFP_KERNEL);

	if (!buf) {



	dev->urb_intr = usb_alloc_urb(0, GFP_KERNEL);

	if (!dev->urb_intr) {

		ret = -ENOMEM;

		goto out5;

	}



	dev->urb_intr = usb_alloc_urb(0, GFP_KERNEL);

	if (!dev->urb_intr) {

	buf = kmalloc(maxp, GFP_KERNEL);

	if (!buf) {

		ret = -ENOMEM;

		goto out6;

	} else {

		goto free_urbs;

	}



	usb_fill_int_urb(dev->urb_intr, dev->udev,

			 dev->pipe_intr, buf, maxp,

			 intr_complete, dev, period);

	dev->urb_intr->transfer_flags |= URB_FREE_BUFFER;

	}



	dev->maxpacket = usb_maxpacket(dev->udev, dev->pipe_out);



	/* Reject broken descriptors. */

	if (dev->maxpacket == 0) {

		ret = -ENODEV;

		goto out6;

		goto free_urbs;

	}



	/* driver requires remote-wakeup capability during autosuspend. */
@@ -4444,7 +4445,7 @@ static int lan78xx_probe(struct usb_interface *intf, 


	ret = lan78xx_phy_init(dev);

	if (ret < 0)

		goto out7;

		goto free_urbs;



	ret = register_netdev(netdev);

	if (ret != 0) {
@@ -4466,10 +4467,8 @@ static int lan78xx_probe(struct usb_interface *intf, 


out8:

	phy_disconnect(netdev->phydev);

out7:

free_urbs:

	usb_free_urb(dev->urb_intr);

out6:

	kfree(buf);

out5:

	lan78xx_unbind(dev, intf);

out4: