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

!10262 media: dvb-usb: Fix unexpected infinite loop in dvb_usb_read_remote_control() 

Merge Pull Request from: @ci-robot 
 
PR sync from: Zheng Yejian <zhengyejian1@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/J6MAHJE56KBGOQEHHQWDBNT2EG4U6KDY/ 
 
https://gitee.com/openeuler/kernel/issues/IAEPSH 
 
Link:https://gitee.com/openeuler/kernel/pulls/10262

 

Reviewed-by: default avatarXu Kuohai <xukuohai@huawei.com>
Reviewed-by: default avatarYe Weihua <yeweihua4@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents d4b07f7a 1b92da4f

drivers/media/usb/dvb-usb/dvb-usb-init.c

+31 −4
Original line number Diff line number Diff line
@@ -23,11 +23,40 @@ static int dvb_usb_force_pid_filter_usage; 
module_param_named(force_pid_filter_usage, dvb_usb_force_pid_filter_usage, int, 0444);

MODULE_PARM_DESC(force_pid_filter_usage, "force all dvb-usb-devices to use a PID filter, if any (default: 0).");



static int dvb_usb_check_bulk_endpoint(struct dvb_usb_device *d, u8 endpoint)

{

	if (endpoint) {

		int ret;



		ret = usb_pipe_type_check(d->udev, usb_sndbulkpipe(d->udev, endpoint));

		if (ret)

			return ret;

		ret = usb_pipe_type_check(d->udev, usb_rcvbulkpipe(d->udev, endpoint));

		if (ret)

			return ret;

	}

	return 0;

}



static void dvb_usb_clear_halt(struct dvb_usb_device *d, u8 endpoint)

{

	if (endpoint) {

		usb_clear_halt(d->udev, usb_sndbulkpipe(d->udev, endpoint));

		usb_clear_halt(d->udev, usb_rcvbulkpipe(d->udev, endpoint));

	}

}



static int dvb_usb_adapter_init(struct dvb_usb_device *d, short *adapter_nrs)

{

	struct dvb_usb_adapter *adap;

	int ret, n, o;



	ret = dvb_usb_check_bulk_endpoint(d, d->props.generic_bulk_ctrl_endpoint);

	if (ret)

		return ret;

	ret = dvb_usb_check_bulk_endpoint(d, d->props.generic_bulk_ctrl_endpoint_response);

	if (ret)

		return ret;

	for (n = 0; n < d->props.num_adapters; n++) {

		adap = &d->adapter[n];

		adap->dev = d;
@@ -103,10 +132,8 @@ static int dvb_usb_adapter_init(struct dvb_usb_device *d, short *adapter_nrs) 
	 * when reloading the driver w/o replugging the device

	 * sometimes a timeout occurs, this helps

	 */

	if (d->props.generic_bulk_ctrl_endpoint != 0) {

		usb_clear_halt(d->udev, usb_sndbulkpipe(d->udev, d->props.generic_bulk_ctrl_endpoint));

		usb_clear_halt(d->udev, usb_rcvbulkpipe(d->udev, d->props.generic_bulk_ctrl_endpoint));

	}

	dvb_usb_clear_halt(d, d->props.generic_bulk_ctrl_endpoint);

	dvb_usb_clear_halt(d, d->props.generic_bulk_ctrl_endpoint_response);



	return 0;