Skip to contentSkip to conversation

Fix syzkaller bug: hung task in hub_port_init

PATCH Superseded Anirudh Rayabharam 3 participants 8 messages Aug 13, 2021 – Aug 19, 2021

Subsystems (2)

v3 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

v3 cover Fix syzkaller bug: hung task in hub_port_init

This series fixes the hung task bug in hub_port_init reported by syzkaller at:

https://syzkaller.appspot.com/bug?id=08f12df95ae7da69814e64eb5515d5a85ed06b76

The first patch in the series fixes the issue and the second patch does some refactoring to avoid duplicate code.

Changes in v3:
- Split the patch into two patches
- Remove the convenience wrappers as suggested by Shuah
- Remove the WARN as suggested by Greg

Changes in v2:
Use WARN_ON() instead of BUG() when unlink_list is neither unlink_tx nor unlink_rx.
v2: https://lore.kernel.org/lkml/[email protected]/

v1: https://lore.kernel.org/lkml/[email protected]/

Anirudh Rayabharam (2):
usbip: give back URBs for unsent unlink requests during cleanup
usbip: eliminate duplicate code in vhci_device_unlink_cleanup

 drivers/usb/usbip/vhci_hcd.c | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)
Signature · 1 line
2.26.2
#1 lore raw

PATCH v3 1/2 usbip: give back URBs for unsent unlink requests during cleanup

In vhci_device_unlink_cleanup(), the URBs for unsent unlink requests are not given back. This sometimes causes usb_kill_urb to wait indefinitely for that urb to be given back. syzbot has reported a hung task issue [1] for this.

To fix this, give back the urbs corresponding to unsent unlink requests (unlink_tx list) similar to how urbs corresponding to unanswered unlink requests (unlink_rx list) are given back.

[1]: https://syzkaller.appspot.com/bug?id=08f12df95ae7da69814e64eb5515d5a85ed06b76

---
 drivers/usb/usbip/vhci_hcd.c | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
drivers/usb/usbip/vhci_hcd.c +26 -0
index 4ba6bcdaa8e9..6f3f374d4bbc 100644
@@ -957,8 +957,34 @@ static void vhci_device_unlink_cleanup(struct vhci_device *vdev)
 	spin_lock(&vdev->priv_lock);
 
 	list_for_each_entry_safe(unlink, tmp, &vdev->unlink_tx, list) {
+		struct urb *urb;
+
+		/* give back URB of unsent unlink request */
 		pr_info("unlink cleanup tx %lu\n", unlink->unlink_seqnum);
+
+		urb = pickup_urb_and_free_priv(vdev, unlink->unlink_seqnum);
+		if (!urb) {
+			pr_info("the urb (seqnum %lu) was already given back\n",
+				unlink->unlink_seqnum);
+			list_del(&unlink->list);
+			kfree(unlink);
+			continue;
+		}
+
+		urb->status = -ENODEV;
+
+		usb_hcd_unlink_urb_from_ep(hcd, urb);
+
 		list_del(&unlink->list);
+
+		spin_unlock(&vdev->priv_lock);
+		spin_unlock_irqrestore(&vhci->lock, flags);
+
+		usb_hcd_giveback_urb(hcd, urb, urb->status);
+
+		spin_lock_irqsave(&vhci->lock, flags);
+		spin_lock(&vdev->priv_lock);
+
 		kfree(unlink);
 	}
 
Signature · 1 line
2.26.2
maintainer
#2 lore raw

Re: [PATCH v3 1/2] usbip: give back URBs for unsent unlink requests during cleanup

Quoted 23 lines · Anirudh Rayabharam

In vhci_device_unlink_cleanup(), the URBs for unsent unlink requests are not given back. This sometimes causes usb_kill_urb to wait indefinitely for that urb to be given back. syzbot has reported a hung task issue [1] for this.

To fix this, give back the urbs corresponding to unsent unlink requests (unlink_tx list) similar to how urbs corresponding to unanswered unlink requests (unlink_rx list) are given back.

[1]: https://syzkaller.appspot.com/bug?id=08f12df95ae7da69814e64eb5515d5a85ed06b76

---
  drivers/usb/usbip/vhci_hcd.c | 26 ++++++++++++++++++++++++++
  1 file changed, 26 insertions(+)
drivers/usb/usbip/vhci_hcd.c +0 -0
index 4ba6bcdaa8e9..6f3f374d4bbc 100644

drivers/usb/usbip/vhci_hcd.c static void vhci_device_unlink_cleanup(struct vhci_device *vdev) · line 963

Quoted 7 lines
drivers/usb/usbip/vhci_hcd.c +3 -0
@@ -957,8 +957,34 @@ static void vhci_device_unlink_cleanup(struct vhci_device *vdev)
  	spin_lock(&vdev->priv_lock);
 
  	list_for_each_entry_safe(unlink, tmp, &vdev->unlink_tx, list) {
+		struct urb *urb;
+
+		/* give back URB of unsent unlink request */
  		pr_info("unlink cleanup tx %lu\n", unlink->unlink_seqnum);

I know this is an exiting one.
Let's make this pr_debug or remove it all together.

drivers/usb/usbip/vhci_hcd.c static void vhci_device_unlink_cleanup(struct vhci_device *vdev) · line 968

Quoted 5 lines
drivers/usb/usbip/vhci_hcd.c +5 -0
+
+		urb = pickup_urb_and_free_priv(vdev, unlink->unlink_seqnum);
+		if (!urb) {
+			pr_info("the urb (seqnum %lu) was already given back\n",
+				unlink->unlink_seqnum);

Let's make this pr_debug or remove it all together.

Quoted 13 lines
drivers/usb/usbip/vhci_hcd.c +11 -0
+			list_del(&unlink->list);
+			kfree(unlink);
+			continue;
+		}
+
+		urb->status = -ENODEV;
+
+		usb_hcd_unlink_urb_from_ep(hcd, urb);
+
  		list_del(&unlink->list);
+
+		spin_unlock(&vdev->priv_lock);

drivers/usb/usbip/vhci_hcd.c static void vhci_device_unlink_cleanup(struct vhci_device *vdev) · line 990

Quoted 10 lines
drivers/usb/usbip/vhci_hcd.c +7 -0
+		spin_unlock_irqrestore(&vhci->lock, flags);
+
+		usb_hcd_giveback_urb(hcd, urb, urb->status);
+
+		spin_lock_irqsave(&vhci->lock, flags);
+		spin_lock(&vdev->priv_lock);
+
  		kfree(unlink);
  	}
 

thanks,
-- Shuah

maintainer
#3 lore raw

Re: [PATCH v3 1/2] usbip: give back URBs for unsent unlink requests during cleanup

Quoted 34 lines · Shuah Khan
Quoted 23 lines · Anirudh Rayabharam

In vhci_device_unlink_cleanup(), the URBs for unsent unlink requests are not given back. This sometimes causes usb_kill_urb to wait indefinitely for that urb to be given back. syzbot has reported a hung task issue [1] for this.

To fix this, give back the urbs corresponding to unsent unlink requests (unlink_tx list) similar to how urbs corresponding to unanswered unlink requests (unlink_rx list) are given back.

[1]: https://syzkaller.appspot.com/bug?id=08f12df95ae7da69814e64eb5515d5a85ed06b76

---
  drivers/usb/usbip/vhci_hcd.c | 26 ++++++++++++++++++++++++++
  1 file changed, 26 insertions(+)
drivers/usb/usbip/vhci_hcd.c +0 -0
index 4ba6bcdaa8e9..6f3f374d4bbc 100644

drivers/usb/usbip/vhci_hcd.c static void vhci_device_unlink_cleanup(struct vhci_device *vdev) · line 962

Quoted 6 lines
drivers/usb/usbip/vhci_hcd.c +3 -0
@@ -957,8 +957,34 @@ static void vhci_device_unlink_cleanup(struct vhci_device *vdev)
  	spin_lock(&vdev->priv_lock);
  	list_for_each_entry_safe(unlink, tmp, &vdev->unlink_tx, list) {
+		struct urb *urb;
+
+		/* give back URB of unsent unlink request */
  		pr_info("unlink cleanup tx %lu\n", unlink->unlink_seqnum);

I know this is an exiting one.
Let's make this pr_debug or remove it all together.

Quoted 7 lines

drivers/usb/usbip/vhci_hcd.c static void vhci_device_unlink_cleanup(struct vhci_device *vdev) · line 968

Quoted 5 lines
drivers/usb/usbip/vhci_hcd.c +5 -0
+
+		urb = pickup_urb_and_free_priv(vdev, unlink->unlink_seqnum);
+		if (!urb) {
+			pr_info("the urb (seqnum %lu) was already given back\n",
+				unlink->unlink_seqnum);

Let's make this pr_debug or remove it all together.

As you have a struct device for all of these, please use dev_dbg() and friends, not pr_*(), for all of these.

thanks,

greg k-h

maintainer
#4 lore raw

Re: [PATCH v3 1/2] usbip: give back URBs for unsent unlink requests during cleanup

Quoted 43 lines · Greg KH
Quoted 34 lines · Shuah Khan
Quoted 23 lines · Anirudh Rayabharam

In vhci_device_unlink_cleanup(), the URBs for unsent unlink requests are not given back. This sometimes causes usb_kill_urb to wait indefinitely for that urb to be given back. syzbot has reported a hung task issue [1] for this.

To fix this, give back the urbs corresponding to unsent unlink requests (unlink_tx list) similar to how urbs corresponding to unanswered unlink requests (unlink_rx list) are given back.

[1]: https://syzkaller.appspot.com/bug?id=08f12df95ae7da69814e64eb5515d5a85ed06b76

---
   drivers/usb/usbip/vhci_hcd.c | 26 ++++++++++++++++++++++++++
   1 file changed, 26 insertions(+)
drivers/usb/usbip/vhci_hcd.c +0 -0
index 4ba6bcdaa8e9..6f3f374d4bbc 100644

drivers/usb/usbip/vhci_hcd.c static void vhci_device_unlink_cleanup(struct vhci_device *vdev) · line 962

Quoted 6 lines
drivers/usb/usbip/vhci_hcd.c +3 -0
@@ -957,8 +957,34 @@ static void vhci_device_unlink_cleanup(struct vhci_device *vdev)
   	spin_lock(&vdev->priv_lock);
   	list_for_each_entry_safe(unlink, tmp, &vdev->unlink_tx, list) {
+		struct urb *urb;
+
+		/* give back URB of unsent unlink request */
   		pr_info("unlink cleanup tx %lu\n", unlink->unlink_seqnum);

I know this is an exiting one.
Let's make this pr_debug or remove it all together.

Quoted 7 lines

drivers/usb/usbip/vhci_hcd.c static void vhci_device_unlink_cleanup(struct vhci_device *vdev) · line 968

Quoted 5 lines
drivers/usb/usbip/vhci_hcd.c +5 -0
+
+		urb = pickup_urb_and_free_priv(vdev, unlink->unlink_seqnum);
+		if (!urb) {
+			pr_info("the urb (seqnum %lu) was already given back\n",
+				unlink->unlink_seqnum);

Let's make this pr_debug or remove it all together.

Quoted 3 lines

As you have a struct device for all of these, please use dev_dbg() and friends, not pr_*(), for all of these.

Yes. Makes perfect sense.

thanks,
-- Shuah
_______________________________________________
Linux-kernel-mentees mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees

#5 lore raw

Re: [PATCH v3 1/2] usbip: give back URBs for unsent unlink requests during cleanup

Quoted 44 lines · Shuah Khan
Quoted 43 lines · Greg KH
Quoted 41 lines · Shuah Khan
Quoted 23 lines · Anirudh Rayabharam

In vhci_device_unlink_cleanup(), the URBs for unsent unlink requests are not given back. This sometimes causes usb_kill_urb to wait indefinitely for that urb to be given back. syzbot has reported a hung task issue [1] for this.

To fix this, give back the urbs corresponding to unsent unlink requests (unlink_tx list) similar to how urbs corresponding to unanswered unlink requests (unlink_rx list) are given back.

[1]: https://syzkaller.appspot.com/bug?id=08f12df95ae7da69814e64eb5515d5a85ed06b76

---
   drivers/usb/usbip/vhci_hcd.c | 26 ++++++++++++++++++++++++++
   1 file changed, 26 insertions(+)
drivers/usb/usbip/vhci_hcd.c +0 -0
index 4ba6bcdaa8e9..6f3f374d4bbc 100644

drivers/usb/usbip/vhci_hcd.c static void vhci_device_unlink_cleanup(struct vhci_device *vdev) · line 962

Quoted 6 lines
drivers/usb/usbip/vhci_hcd.c +3 -0
@@ -957,8 +957,34 @@ static void vhci_device_unlink_cleanup(struct vhci_device *vdev)
   	spin_lock(&vdev->priv_lock);
   	list_for_each_entry_safe(unlink, tmp, &vdev->unlink_tx, list) {
+		struct urb *urb;
+
+		/* give back URB of unsent unlink request */
   		pr_info("unlink cleanup tx %lu\n", unlink->unlink_seqnum);

I know this is an exiting one.
Let's make this pr_debug or remove it all together.

drivers/usb/usbip/vhci_hcd.c static void vhci_device_unlink_cleanup(struct vhci_device *vdev) · line 968

Quoted 5 lines
drivers/usb/usbip/vhci_hcd.c +5 -0
+
+		urb = pickup_urb_and_free_priv(vdev, unlink->unlink_seqnum);
+		if (!urb) {
+			pr_info("the urb (seqnum %lu) was already given back\n",
+				unlink->unlink_seqnum);

Let's make this pr_debug or remove it all together.

Quoted 5 lines
Quoted 3 lines

As you have a struct device for all of these, please use dev_dbg() and friends, not pr_*(), for all of these.

Yes. Makes perfect sense.

Perhaps we should use usbip_dbg_vhci_hc() instead of dev_dbg()? It is one of the custom macros defined by the usbip driver for printing debug logs.

Thanks,

Anirudh

maintainer
#6 lore raw

Re: [PATCH v3 1/2] usbip: give back URBs for unsent unlink requests during cleanup

Quoted 49 lines · Anirudh Rayabharam
Quoted 48 lines · Shuah Khan
Quoted 46 lines · Greg KH
Quoted 34 lines · Shuah Khan
Quoted 23 lines · Anirudh Rayabharam

In vhci_device_unlink_cleanup(), the URBs for unsent unlink requests are not given back. This sometimes causes usb_kill_urb to wait indefinitely for that urb to be given back. syzbot has reported a hung task issue [1] for this.

To fix this, give back the urbs corresponding to unsent unlink requests (unlink_tx list) similar to how urbs corresponding to unanswered unlink requests (unlink_rx list) are given back.

[1]: https://syzkaller.appspot.com/bug?id=08f12df95ae7da69814e64eb5515d5a85ed06b76

---
    drivers/usb/usbip/vhci_hcd.c | 26 ++++++++++++++++++++++++++
    1 file changed, 26 insertions(+)
drivers/usb/usbip/vhci_hcd.c +0 -0
index 4ba6bcdaa8e9..6f3f374d4bbc 100644

drivers/usb/usbip/vhci_hcd.c static void vhci_device_unlink_cleanup(struct vhci_device *vdev) · line 962

Quoted 6 lines
drivers/usb/usbip/vhci_hcd.c +3 -0
@@ -957,8 +957,34 @@ static void vhci_device_unlink_cleanup(struct vhci_device *vdev)
    	spin_lock(&vdev->priv_lock);
    	list_for_each_entry_safe(unlink, tmp, &vdev->unlink_tx, list) {
+		struct urb *urb;
+
+		/* give back URB of unsent unlink request */
    		pr_info("unlink cleanup tx %lu\n", unlink->unlink_seqnum);

I know this is an exiting one.
Let's make this pr_debug or remove it all together.

Quoted 7 lines

drivers/usb/usbip/vhci_hcd.c static void vhci_device_unlink_cleanup(struct vhci_device *vdev) · line 968

Quoted 5 lines
drivers/usb/usbip/vhci_hcd.c +5 -0
+
+		urb = pickup_urb_and_free_priv(vdev, unlink->unlink_seqnum);
+		if (!urb) {
+			pr_info("the urb (seqnum %lu) was already given back\n",
+				unlink->unlink_seqnum);

Let's make this pr_debug or remove it all together.

As you have a struct device for all of these, please use dev_dbg() and friends, not pr_*(), for all of these.

Quoted 6 lines
Quoted 1 line

Yes. Makes perfect sense.

Perhaps we should use usbip_dbg_vhci_hc() instead of dev_dbg()? It is one of the custom macros defined by the usbip driver for printing debug logs.

Yes that macro could be used. However, let's just get rid of the messages. I don't see much use for them.

thanks,
-- Shuah

#7 lore raw

PATCH v3 2/2 usbip: eliminate duplicate code in vhci_device_unlink_cleanup

In reply to Anirudh Rayabharam

The cleanup code for unlink_tx and unlink_rx lists is almost the same. So, extract it into a new function and call it for both unlink_rx and unlink_tx.

---
 drivers/usb/usbip/vhci_hcd.c | 57 ++++++++++++------------------------
 1 file changed, 18 insertions(+), 39 deletions(-)
drivers/usb/usbip/vhci_hcd.c +18 -39
index 6f3f374d4bbc..b142508b46ce 100644
@@ -945,7 +945,8 @@ static int vhci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
 	return 0;
 }
 
-static void vhci_device_unlink_cleanup(struct vhci_device *vdev)
+static void vhci_cleanup_unlink_list(struct vhci_device *vdev,
+		struct list_head *unlink_list)
 {
 	struct vhci_hcd *vhci_hcd = vdev_to_vhci_hcd(vdev);
 	struct usb_hcd *hcd = vhci_hcd_to_hcd(vhci_hcd);
@@ -956,46 +957,15 @@ static void vhci_device_unlink_cleanup(struct vhci_device *vdev)
 	spin_lock_irqsave(&vhci->lock, flags);
 	spin_lock(&vdev->priv_lock);
 
-	list_for_each_entry_safe(unlink, tmp, &vdev->unlink_tx, list) {
+	list_for_each_entry_safe(unlink, tmp, unlink_list, list) {
 		struct urb *urb;
 
-		/* give back urb of unsent unlink request */
-		pr_info("unlink cleanup tx %lu\n", unlink->unlink_seqnum);
-
-		urb = pickup_urb_and_free_priv(vdev, unlink->unlink_seqnum);
-		if (!urb) {
-			pr_info("the urb (seqnum %lu) was already given back\n",
-				unlink->unlink_seqnum);
-			list_del(&unlink->list);
-			kfree(unlink);
-			continue;
-		}
-
-		urb->status = -ENODEV;
-
-		usb_hcd_unlink_urb_from_ep(hcd, urb);
-
-		list_del(&unlink->list);
-
-		spin_unlock(&vdev->priv_lock);
-		spin_unlock_irqrestore(&vhci->lock, flags);
-
-		usb_hcd_giveback_urb(hcd, urb, urb->status);
-
-		spin_lock_irqsave(&vhci->lock, flags);
-		spin_lock(&vdev->priv_lock);
-
-		kfree(unlink);
-	}
-
-	while (!list_empty(&vdev->unlink_rx)) {
-		struct urb *urb;
-
-		unlink = list_first_entry(&vdev->unlink_rx, struct vhci_unlink,
-			list);
-
-		/* give back URB of unanswered unlink request */
-		pr_info("unlink cleanup rx %lu\n", unlink->unlink_seqnum);
+		if (unlink_list == &vdev->unlink_tx)
+			pr_info("unlink cleanup tx %lu\n",
+					unlink->unlink_seqnum);
+		else
+			pr_info("unlink_cleanup rx %lu\n",
+					unlink->unlink_seqnum);
 
 		urb = pickup_urb_and_free_priv(vdev, unlink->unlink_seqnum);
 		if (!urb) {
@@ -1027,6 +997,15 @@ static void vhci_device_unlink_cleanup(struct vhci_device *vdev)
 	spin_unlock_irqrestore(&vhci->lock, flags);
 }
 
+static void vhci_device_unlink_cleanup(struct vhci_device *vdev)
+{
+	/* give back URB of unsent unlink request */
+	vhci_cleanup_unlink_list(vdev, &vdev->unlink_tx);
+
+	/* give back URB of unanswered unlink request */
+	vhci_cleanup_unlink_list(vdev, &vdev->unlink_rx);
+}
+
 /*
  * The important thing is that only one context begins cleanup.
  * This is why error handling and cleanup become simple.
Signature · 6 lines
2.26.2

_______________________________________________
Linux-kernel-mentees mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees