[Qemu-commits] [qemu/qemu] 4c7a67: usb-mtp: use a list for keeping track of children

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 4c7a67f5cdc79ed3f91a15e869c8dd653efa19b4
      
https://github.com/qemu/qemu/commit/4c7a67f5cdc79ed3f91a15e869c8dd653efa19b4
  Author: Bandan Das <address@hidden>
  Date:   2015-12-15 (Tue, 15 Dec 2015)

  Changed paths:
    M hw/usb/dev-mtp.c
    M trace-events

  Log Message:
  -----------
  usb-mtp: use a list for keeping track of children

To support adding/removal of objects, we will need to update
the object cache hierarchy we have built internally. Convert
to using a Qlist for easier management.

Signed-off-by: Bandan Das <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: b3c4d4250f571c2c739699be563f764eae1e6f52
      
https://github.com/qemu/qemu/commit/b3c4d4250f571c2c739699be563f764eae1e6f52
  Author: Bandan Das <address@hidden>
  Date:   2015-12-15 (Tue, 15 Dec 2015)

  Changed paths:
    M hw/usb/dev-mtp.c

  Log Message:
  -----------
  usb-mtp: free objects on a mtp reset

On a reset, call usb_mtp_object_free on all objects and their children

Signed-off-by: Bandan Das <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 8e3e3897ce6d9e927053229ab0672f079c9c1501
      
https://github.com/qemu/qemu/commit/8e3e3897ce6d9e927053229ab0672f079c9c1501
  Author: Bandan Das <address@hidden>
  Date:   2015-12-15 (Tue, 15 Dec 2015)

  Changed paths:
    M hw/usb/dev-mtp.c
    M trace-events

  Log Message:
  -----------
  usb-mtp: Add support for inotify based file monitoring

For now, we use inotify watches to track only a small number of
events, namely, add, delete and modify. Note that for delete, the kernel
already deactivates the watch for us and we just need to
take care of modifying our internal state.

inotify is a linux only mechanism.

Suggested-by: Gerd Hoffman <address@hidden>
Signed-off-by: Bandan Das <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 93d592e3d1a45e4c0b3969e1fbbc459d6df826aa
      
https://github.com/qemu/qemu/commit/93d592e3d1a45e4c0b3969e1fbbc459d6df826aa
  Author: Bandan Das <address@hidden>
  Date:   2015-12-15 (Tue, 15 Dec 2015)

  Changed paths:
    M hw/usb/dev-mtp.c

  Log Message:
  -----------
  usb-mtp: add support for basic mtp events

When the host polls for events, we check our
events qlist and send one event at a time. Also, note
that the event packet needs to be sent in one go, so
I increased the max packet size to 64.

Tested with a linux guest.

Signed-off-by: Bandan Das <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 156a2e4dbffa85997636a7a39ef12da6f1b40254
      
https://github.com/qemu/qemu/commit/156a2e4dbffa85997636a7a39ef12da6f1b40254
  Author: Gerd Hoffmann <address@hidden>
  Date:   2015-12-15 (Tue, 15 Dec 2015)

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

  Log Message:
  -----------
  ehci: make idt processing more robust

Make ehci_process_itd return an error in case we didn't do any actual
iso transfer because we've found no active transaction.  That'll avoid
ehci happily run in circles forever if the guest builds a loop out of
idts.

This is CVE-2015-8558.

Cc: address@hidden
Reported-by: Qinghao Tang <address@hidden>
Tested-by: P J P <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: dc337c6e26abe6b9fb4ec654e9d19e123645a198
      
https://github.com/qemu/qemu/commit/dc337c6e26abe6b9fb4ec654e9d19e123645a198
  Author: Peter Maydell <address@hidden>
  Date:   2015-12-17 (Thu, 17 Dec 2015)

  Changed paths:
    M hw/usb/dev-mtp.c
    M hw/usb/hcd-ehci.c
    M trace-events

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

usb: ehci idt fix, event support for mtp

# gpg: Signature made Tue 15 Dec 2015 09:54:22 GMT using RSA key ID D3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <address@hidden>"
# gpg:                 aka "Gerd Hoffmann <address@hidden>"
# gpg:                 aka "Gerd Hoffmann (private) <address@hidden>"

* remotes/kraxel/tags/pull-usb-20151215-1:
  ehci: make idt processing more robust
  usb-mtp: add support for basic mtp events
  usb-mtp: Add support for inotify based file monitoring
  usb-mtp: free objects on a mtp reset
  usb-mtp: use a list for keeping track of children

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/71f3ef08369d...dc337c6e26ab