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

!9698 Fix CVE-2021-47270 

Merge Pull Request from: @ci-robot 
 
PR sync from: Zheng Zucheng <zhengzucheng@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/KFEZAUKCT4HMH6OGP4YX3PUJYYZ3TO3X/ 
Maciej Żenczykowski (1):
  usb: fix various gadgets null ptr deref on 10gbps cabling.

Pavankumar Kondeti (1):
  usb: gadget: f_sourcesink: Fix isoc transfer for USB_SPEED_SUPER_PLUS


-- 
2.34.1
 
https://gitee.com/src-openeuler/kernel/issues/I9R4K4 
 
Link:https://gitee.com/openeuler/kernel/pulls/9698

 

Reviewed-by: default avatarLiu YongQiang <liuyongqiang13@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parents eb6beb7d 63e276f5

drivers/usb/gadget/function/f_ecm.c

+1 −1
Original line number Diff line number Diff line
@@ -788,7 +788,7 @@ ecm_bind(struct usb_configuration *c, struct usb_function *f) 
		fs_ecm_notify_desc.bEndpointAddress;



	status = usb_assign_descriptors(f, ecm_fs_function, ecm_hs_function,

			ecm_ss_function, NULL);

			ecm_ss_function, ecm_ss_function);

	if (status)

		goto fail;

drivers/usb/gadget/function/f_eem.c

+1 −1
Original line number Diff line number Diff line
@@ -305,7 +305,7 @@ static int eem_bind(struct usb_configuration *c, struct usb_function *f) 
	eem_ss_out_desc.bEndpointAddress = eem_fs_out_desc.bEndpointAddress;



	status = usb_assign_descriptors(f, eem_fs_function, eem_hs_function,

			eem_ss_function, NULL);

			eem_ss_function, eem_ss_function);

	if (status)

		goto fail;

drivers/usb/gadget/function/f_hid.c

+2 −1
Original line number Diff line number Diff line
@@ -808,7 +808,8 @@ static int hidg_bind(struct usb_configuration *c, struct usb_function *f) 
		hidg_fs_out_ep_desc.bEndpointAddress;



	status = usb_assign_descriptors(f, hidg_fs_descriptors,

			hidg_hs_descriptors, hidg_ss_descriptors, NULL);

			hidg_hs_descriptors, hidg_ss_descriptors,

			hidg_ss_descriptors);

	if (status)

		goto fail;

drivers/usb/gadget/function/f_loopback.c

+1 −1
Original line number Diff line number Diff line
@@ -207,7 +207,7 @@ static int loopback_bind(struct usb_configuration *c, struct usb_function *f) 
	ss_loop_sink_desc.bEndpointAddress = fs_loop_sink_desc.bEndpointAddress;



	ret = usb_assign_descriptors(f, fs_loopback_descs, hs_loopback_descs,

			ss_loopback_descs, NULL);

			ss_loopback_descs, ss_loopback_descs);

	if (ret)

		return ret;

drivers/usb/gadget/function/f_printer.c

+2 −1
Original line number Diff line number Diff line
@@ -1063,7 +1063,8 @@ static int printer_func_bind(struct usb_configuration *c, 
	ss_ep_out_desc.bEndpointAddress = fs_ep_out_desc.bEndpointAddress;



	ret = usb_assign_descriptors(f, fs_printer_function,

			hs_printer_function, ss_printer_function, NULL);

			hs_printer_function, ss_printer_function,

			ss_printer_function);

	if (ret)

		return ret;