qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Cord Amfmgm <dmamfmgm@gmail.com>
To: qemu-devel@nongnu.org
Subject: hw/usb/hcd-ohci: Fix #1510, #303: pid not IN or OUT
Date: Tue, 6 Feb 2024 01:02:15 -0600	[thread overview]
Message-ID: <CACBuX0T3FqTY_BAYjfjQsevJWf=zKafQXO2oPs98hEv93ALHNQ@mail.gmail.com> (raw)

This changes the ohci validation to not assert if invalid
data is fed to the ohci controller. The poc suggested in
https://bugs.launchpad.net/qemu/+bug/1907042
migrated to #303 does the following to feed it a
SETUP pid and EndPt of 1:

        uint32_t MaxPacket = 64;
        uint32_t TDFormat = 0;
        uint32_t Skip = 0;
        uint32_t Speed = 0;
        uint32_t Direction = 0;  /* #define OHCI_TD_DIR_SETUP 0 */
        uint32_t EndPt = 1;
        uint32_t FuncAddress = 0;
        ed->attr = (MaxPacket << 16) | (TDFormat << 15) |(Skip << 14)
| (Speed << 13)
                   | (Direction << 11) | (EndPt << 7) | FuncAddress;
        ed->tailp = /*TDQTailPntr= */ 0;
        ed->headp = ((/*TDQHeadPntr= */ &td[0]) & 0xfffffff0) | (/*
ToggleCarry= */ 0 << 1);
        ed->next_ed = (/* NextED= */ 0 & 0xfffffff0)

qemu-fuzz also caught the same issue in #1510

The if (td.cbp > td.be) logic in ohci_service_td() causes an
ohci_die() as well. My understanding of the OHCI spec 4.3.1.2
Table 4-2 allows td.cbp to be one byte more than td.be to
signal the buffer has zero length. The new check in qemu
appears to have been added since qemu-4.2.

Signed-off-by: David Hubbard <dmamfmgm@gmail.com>

diff --git a/hw/usb/hcd-ohci.c b/hw/usb/hcd-ohci.c
index d73b53f33c..d087f36618 100644
--- a/hw/usb/hcd-ohci.c
+++ b/hw/usb/hcd-ohci.c
@@ -927,6 +927,11 @@ static int ohci_service_td(OHCIState *ohci,
struct ohci_ed *ed)
     case OHCI_TD_DIR_SETUP:
         str = "setup";
         pid = USB_TOKEN_SETUP;
+        if (OHCI_BM(ed->flags, ED_EN) > 0) {  /* setup only allowed
to ep == 0 */
+            trace_usb_ohci_td_bad_pid(str, ed->flags, td.flags);
+            ohci_die(ohci);
+            return 1;
+        }
         break;
     default:
         trace_usb_ohci_td_bad_direction(dir);
@@ -936,8 +941,8 @@ static int ohci_service_td(OHCIState *ohci, struct
ohci_ed *ed)
         if ((td.cbp & 0xfffff000) != (td.be & 0xfffff000)) {
             len = (td.be & 0xfff) + 0x1001 - (td.cbp & 0xfff);
         } else {
-            if (td.cbp > td.be) {
-                trace_usb_ohci_iso_td_bad_cc_overrun(td.cbp, td.be);
+            if (td.cbp > td.be + 1) {
+                trace_usb_ohci_td_bad_buf(td.cbp, td.be);
                 ohci_die(ohci);
                 return 1;
             }


             reply	other threads:[~2024-02-06 13:25 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-02-06  7:02 Cord Amfmgm [this message]
2024-02-06  7:05 ` hw/usb/hcd-ohci: Fix #1510, #303: pid not IN or OUT Cord Amfmgm
  -- strict thread matches above, loose matches on Subject: below --
2024-02-06  7:13 Cord Amfmgm
2024-04-18 15:43 ` Michael Tokarev
2024-04-19 15:00   ` Cord Amfmgm
2024-04-24 20:43   ` Cord Amfmgm
2024-05-07 20:20     ` Cord Amfmgm
2024-05-08  8:44       ` Thomas Huth
2024-05-08  9:53       ` Philippe Mathieu-Daudé
2024-05-08 15:28         ` Cord Amfmgm
2024-05-09  0:32           ` Cord Amfmgm
2024-05-09 17:48           ` Peter Maydell
2024-05-09 18:16             ` Cord Amfmgm
2024-05-09 20:37               ` BALATON Zoltan
2024-05-10  7:08                 ` Cord Amfmgm
2024-05-11 10:25               ` Peter Maydell
2024-05-12 16:24                 ` Cord Amfmgm
2024-05-20 17:04 ` Peter Maydell
2024-05-20 22:24   ` Cord Amfmgm
2024-05-28 14:03     ` Peter Maydell
2024-05-28 15:37       ` Cord Amfmgm
2024-05-28 16:32         ` Peter Maydell
2024-05-30  4:54           ` Cord Amfmgm
2024-05-30  8:33             ` Alex Bennée
2024-05-30 16:03               ` Cord Amfmgm
2024-05-30 19:12                 ` Alex Bennée
2024-05-30 21:11                   ` Cord Amfmgm

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='CACBuX0T3FqTY_BAYjfjQsevJWf=zKafQXO2oPs98hEv93ALHNQ@mail.gmail.com' \
    --to=dmamfmgm@gmail.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).