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

!11164 usb: vhci-hcd: Do not drop references before new references are gained 

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

 

Reviewed-by: default avatarXu Kuohai <xukuohai@huawei.com>
Reviewed-by: default avatarYe Weihua <yeweihua4@huawei.com>
Reviewed-by: default avatarLiu YongQiang <liuyongqiang13@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parents 5a2b3748 22dd5621

drivers/usb/usbip/vhci_hcd.c

+6 −3
Original line number Diff line number Diff line
@@ -741,6 +741,7 @@ static int vhci_urb_enqueue(struct usb_hcd *hcd, struct urb *urb, gfp_t mem_flag 
	 *

	 */

	if (usb_pipedevice(urb->pipe) == 0) {

		struct usb_device *old;

		__u8 type = usb_pipetype(urb->pipe);

		struct usb_ctrlrequest *ctrlreq =

			(struct usb_ctrlrequest *) urb->setup_packet;
@@ -751,14 +752,15 @@ static int vhci_urb_enqueue(struct usb_hcd *hcd, struct urb *urb, gfp_t mem_flag 
			goto no_need_xmit;

		}



		old = vdev->udev;

		switch (ctrlreq->bRequest) {

		case USB_REQ_SET_ADDRESS:

			/* set_address may come when a device is reset */

			dev_info(dev, "SetAddress Request (%d) to port %d\n",

				 ctrlreq->wValue, vdev->rhport);



			usb_put_dev(vdev->udev);

			vdev->udev = usb_get_dev(urb->dev);

			usb_put_dev(old);



			spin_lock(&vdev->ud.lock);

			vdev->ud.status = VDEV_ST_USED;
@@ -777,8 +779,8 @@ static int vhci_urb_enqueue(struct usb_hcd *hcd, struct urb *urb, gfp_t mem_flag 
				usbip_dbg_vhci_hc(

					"Not yet?:Get_Descriptor to device 0 (get max pipe size)\n");



			usb_put_dev(vdev->udev);

			vdev->udev = usb_get_dev(urb->dev);

			usb_put_dev(old);

			goto out;



		default:
@@ -1061,6 +1063,7 @@ static void vhci_shutdown_connection(struct usbip_device *ud) 
static void vhci_device_reset(struct usbip_device *ud)

{

	struct vhci_device *vdev = container_of(ud, struct vhci_device, ud);

	struct usb_device *old = vdev->udev;

	unsigned long flags;



	spin_lock_irqsave(&ud->lock, flags);
@@ -1068,8 +1071,8 @@ static void vhci_device_reset(struct usbip_device *ud) 
	vdev->speed  = 0;

	vdev->devid  = 0;



	usb_put_dev(vdev->udev);

	vdev->udev = NULL;

	usb_put_dev(old);



	if (ud->tcp_socket) {

		sockfd_put(ud->tcp_socket);