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

!8180 Fix CVE-2021-47495 

Merge Pull Request from: @ci-robot 
 
PR sync from: Yang Yingliang <yangyingliang@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/XTCCVWBWAJJIMEMFN3GVEO65S53S2C2F/ 
Oliver Neukum (1):
  usbnet: sanity check for maxpacket

Wang Hai (1):
  usbnet: fix error return code in usbnet_probe()


-- 
2.25.1
 
https://gitee.com/src-openeuler/kernel/issues/I9RCX9 
 
Link:https://gitee.com/openeuler/kernel/pulls/8180

 

Reviewed-by: default avatarLiu YongQiang <liuyongqiang13@huawei.com>
Reviewed-by: default avatarXiongfeng Wang <wangxiongfeng2@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parents 8098bf3e 2015ffc7

drivers/net/usb/usbnet.c

+5 −0
Original line number Diff line number Diff line
@@ -1784,6 +1784,11 @@ usbnet_probe (struct usb_interface *udev, const struct usb_device_id *prod) 
	if (!dev->rx_urb_size)

		dev->rx_urb_size = dev->hard_mtu;

	dev->maxpacket = usb_maxpacket (dev->udev, dev->out, 1);

	if (dev->maxpacket == 0) {

		/* that is a broken device */

		status = -ENODEV;

		goto out4;

	}



	/* let userspace know we have a random address */

	if (ether_addr_equal(net->dev_addr, node_id))