qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Philippe Mathieu-Daudé" <philmd@redhat.com>,
	"Gerd Hoffmann" <kraxel@redhat.com>
Subject: [PULL 5/6] xhci: fix guest triggerable assert
Date: Mon, 16 Nov 2020 12:10:35 +0100	[thread overview]
Message-ID: <20201116111036.12820-6-kraxel@redhat.com> (raw)
In-Reply-To: <20201116111036.12820-1-kraxel@redhat.com>

We didn't start any work yet so we can just return
at that point instead of asserting.

Buglink: https://bugs.launchpad.net/qemu/+bug/1883732
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-id: 20201105134112.25119-6-kraxel@redhat.com
---
 hw/usb/hcd-xhci.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c
index 79ce5c4be6c4..d00bb0141dac 100644
--- a/hw/usb/hcd-xhci.c
+++ b/hw/usb/hcd-xhci.c
@@ -1904,7 +1904,9 @@ static void xhci_kick_epctx(XHCIEPContext *epctx, unsigned int streamid)
         streamid = 0;
         xhci_set_ep_state(xhci, epctx, NULL, EP_RUNNING);
     }
-    assert(ring->dequeue != 0);
+    if (!ring->dequeue) {
+        return;
+    }
 
     epctx->kick_active++;
     while (1) {
-- 
2.27.0



  parent reply	other threads:[~2020-11-16 11:14 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-11-16 11:10 [PULL 0/6] Fixes 20201116 patches Gerd Hoffmann
2020-11-16 11:10 ` [PULL 1/6] usb-storage: switch trace events Gerd Hoffmann
2020-11-16 11:10 ` [PULL 2/6] usb-storage: add commandlog property Gerd Hoffmann
2020-11-16 11:10 ` [PULL 3/6] usb-storage: use bool for removable property Gerd Hoffmann
2020-11-16 11:10 ` [PULL 4/6] usb-storage: fill csw on cancel Gerd Hoffmann
2020-11-16 11:10 ` Gerd Hoffmann [this message]
2020-11-16 11:10 ` [PULL 6/6] xhci: move sanity checks Gerd Hoffmann
2020-11-16 15:32 ` [PULL 0/6] Fixes 20201116 patches Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20201116111036.12820-6-kraxel@redhat.com \
    --to=kraxel@redhat.com \
    --cc=philmd@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).