qemu-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-commits] [qemu/qemu] 26d56f: usb: fix u2f build


From: Peter Maydell
Subject: [Qemu-commits] [qemu/qemu] 26d56f: usb: fix u2f build
Date: Tue, 22 Sep 2020 10:30:31 -0700

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 26d56f489e68386844e33e558c26ecb67256e32d
      
https://github.com/qemu/qemu/commit/26d56f489e68386844e33e558c26ecb67256e32d
  Author: Gerd Hoffmann <kraxel@redhat.com>
  Date:   2020-09-21 (Mon, 21 Sep 2020)

  Changed paths:
    M hw/usb/u2f-emulated.c

  Log Message:
  -----------
  usb: fix u2f build

Just use qemu_open_old() for a quick fix, switch
to better error handling left for another day.

Fixes: 448058aa99aa ("util: rename qemu_open() to qemu_open_old()")
Cc: César Belley <cesar.belley@lse.epita.fr>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-id: 20200918110122.9121-1-kraxel@redhat.com


  Commit: 1328fe0c32d5474604105b8105310e944976b058
      
https://github.com/qemu/qemu/commit/1328fe0c32d5474604105b8105310e944976b058
  Author: Prasad J Pandit <pjp@fedoraproject.org>
  Date:   2020-09-21 (Mon, 21 Sep 2020)

  Changed paths:
    M hw/usb/hcd-ohci.c

  Log Message:
  -----------
  hw: usb: hcd-ohci: check len and frame_number variables

While servicing the OHCI transfer descriptors(TD), OHCI host
controller derives variables 'start_addr', 'end_addr', 'len'
etc. from values supplied by the host controller driver.
Host controller driver may supply values such that using
above variables leads to out-of-bounds access issues.
Add checks to avoid them.

AddressSanitizer: stack-buffer-overflow on address 0x7ffd53af76a0
  READ of size 2 at 0x7ffd53af76a0 thread T0
  #0 ohci_service_iso_td ../hw/usb/hcd-ohci.c:734
  #1 ohci_service_ed_list ../hw/usb/hcd-ohci.c:1180
  #2 ohci_process_lists ../hw/usb/hcd-ohci.c:1214
  #3 ohci_frame_boundary ../hw/usb/hcd-ohci.c:1257
  #4 timerlist_run_timers ../util/qemu-timer.c:572
  #5 qemu_clock_run_timers ../util/qemu-timer.c:586
  #6 qemu_clock_run_all_timers ../util/qemu-timer.c:672
  #7 main_loop_wait ../util/main-loop.c:527
  #8 qemu_main_loop ../softmmu/vl.c:1676
  #9 main ../softmmu/main.c:50

Reported-by: Gaoning Pan <pgn@zju.edu.cn>
Reported-by: Yongkang Jia <j_kangel@163.com>
Reported-by: Yi Ren <yunye.ry@alibaba-inc.com>
Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
Message-id: 20200915182259.68522-2-ppandit@redhat.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>


  Commit: 1be90ebecc95b09a2ee5af3f60c412b45a766c4f
      
https://github.com/qemu/qemu/commit/1be90ebecc95b09a2ee5af3f60c412b45a766c4f
  Author: Prasad J Pandit <pjp@fedoraproject.org>
  Date:   2020-09-21 (Mon, 21 Sep 2020)

  Changed paths:
    M hw/usb/hcd-ohci.c

  Log Message:
  -----------
  hw: usb: hcd-ohci: check for processed TD before retire

While servicing OHCI transfer descriptors(TD), ohci_service_iso_td
retires a TD if it has passed its time frame. It does not check if
the TD was already processed once and holds an error code in TD_CC.
It may happen if the TD list has a loop. Add check to avoid an
infinite loop condition.

Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
Reviewed-by: Li Qiang <liq3ea@gmail.com>
Message-id: 20200915182259.68522-3-ppandit@redhat.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>


  Commit: edf6ea6fbe793b017a9765b493d7b1675a16a42f
      
https://github.com/qemu/qemu/commit/edf6ea6fbe793b017a9765b493d7b1675a16a42f
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2020-09-22 (Tue, 22 Sep 2020)

  Changed paths:
    M hw/usb/hcd-ohci.c
    M hw/usb/u2f-emulated.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/kraxel/tags/usb-20200921-pull-request' 
into staging

usb: fix u2f build
usb: fix ohci oob access and loop issues

# gpg: Signature made Mon 21 Sep 2020 09:58:06 BST
# gpg:                using RSA key 4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" [full]
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>" [full]
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>" [full]
# Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138

* remotes/kraxel/tags/usb-20200921-pull-request:
  hw: usb: hcd-ohci: check for processed TD before retire
  hw: usb: hcd-ohci: check len and frame_number variables
  usb: fix u2f build

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>


Compare: https://github.com/qemu/qemu/compare/834b9273d5cd...edf6ea6fbe79



reply via email to

[Prev in Thread] Current Thread [Next in Thread]