Skip to content

Commit

Permalink
Merge remote-tracking branch 'remotes/kraxel/tags/pull-usb-20160321-1…
Browse files Browse the repository at this point in the history 
…' into staging

usb: bugfix collection.

# gpg: Signature made Mon 21 Mar 2016 11:07:39 GMT using RSA key ID D3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"

* remotes/kraxel/tags/pull-usb-20160321-1:
  usb: ehci: add capability mmio write function
  hw/usb/dev-mtp: Guard inotify usage with CONFIG_INOTIFY1
  usb: fix unbound stack warning for inotify_watchfn
  usb: fix unbound stack usage for usb_mtp_add_str
  usb: fix unbounded stack warning for xhci_dma_write_u32s
  usb: Fix compilation for Windows

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
  • Loading branch information
@pm215
pm215 committed Mar 22, 2016
2 parents 9fa570d + dff0367 commit ac0d25e
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 17 deletions.
29 changes: 15 additions & 14 deletions hw/usb/dev-mtp.c
View file
Expand Up @@ -14,7 +14,7 @@
#include <dirent.h>

#include <sys/statvfs.h>
#ifdef __linux__
#ifdef CONFIG_INOTIFY1
#include <sys/inotify.h>
#include "qemu/main-loop.h"
#endif
Expand Down Expand Up @@ -92,7 +92,7 @@ enum {
EP_EVENT,
};

#ifdef __linux__
#ifdef CONFIG_INOTIFY1
typedef struct MTPMonEntry MTPMonEntry;

struct MTPMonEntry {
Expand Down Expand Up @@ -127,7 +127,7 @@ struct MTPObject {
char *name;
char *path;
struct stat stat;
#ifdef __linux__
#ifdef CONFIG_INOTIFY1
/* inotify watch cookie */
int watchfd;
#endif
Expand All @@ -152,7 +152,7 @@ struct MTPState {
uint32_t next_handle;

QTAILQ_HEAD(, MTPObject) objects;
#ifdef __linux__
#ifdef CONFIG_INOTIFY1
/* inotify descriptor */
int inotifyfd;
QTAILQ_HEAD(events, MTPMonEntry) events;
Expand Down Expand Up @@ -400,7 +400,7 @@ static MTPObject *usb_mtp_add_child(MTPState *s, MTPObject *o,
return child;
}

#ifdef __linux__
#ifdef CONFIG_INOTIFY1
static MTPObject *usb_mtp_object_lookup_name(MTPObject *parent,
char *name, int len)
{
Expand Down Expand Up @@ -433,12 +433,11 @@ static void inotify_watchfn(void *arg)
MTPState *s = arg;
ssize_t bytes;
/* From the man page: atleast one event can be read */
int len = sizeof(struct inotify_event) + NAME_MAX + 1;
int pos;
char buf[len];
char buf[sizeof(struct inotify_event) + NAME_MAX + 1];

for (;;) {
bytes = read(s->inotifyfd, buf, len);
bytes = read(s->inotifyfd, buf, sizeof(buf));
pos = 0;

if (bytes <= 0) {
Expand Down Expand Up @@ -593,7 +592,7 @@ static void usb_mtp_object_readdir(MTPState *s, MTPObject *o)
if (!dir) {
return;
}
#ifdef __linux__
#ifdef CONFIG_INOTIFY1
int watchfd = usb_mtp_add_watch(s->inotifyfd, o->path);
if (watchfd == -1) {
fprintf(stderr, "usb-mtp: failed to add watch for %s\n", o->path);
Expand Down Expand Up @@ -718,7 +717,7 @@ static void usb_mtp_add_wstr(MTPData *data, const wchar_t *str)
static void usb_mtp_add_str(MTPData *data, const char *str)
{
uint32_t len = strlen(str)+1;
wchar_t wstr[len];
wchar_t *wstr = g_new(wchar_t, len);
size_t ret;

ret = mbstowcs(wstr, str, len);
Expand All @@ -727,6 +726,8 @@ static void usb_mtp_add_str(MTPData *data, const char *str)
} else {
usb_mtp_add_wstr(data, wstr);
}

g_free(wstr);
}

static void usb_mtp_add_time(MTPData *data, time_t time)
Expand Down Expand Up @@ -995,7 +996,7 @@ static void usb_mtp_command(MTPState *s, MTPControl *c)
trace_usb_mtp_op_open_session(s->dev.addr);
s->session = c->argv[0];
usb_mtp_object_alloc(s, s->next_handle++, NULL, s->root);
#ifdef __linux__
#ifdef CONFIG_INOTIFY1
if (usb_mtp_inotify_init(s)) {
fprintf(stderr, "usb-mtp: file monitoring init failed\n");
}
Expand All @@ -1005,7 +1006,7 @@ static void usb_mtp_command(MTPState *s, MTPControl *c)
trace_usb_mtp_op_close_session(s->dev.addr);
s->session = 0;
s->next_handle = 0;
#ifdef __linux__
#ifdef CONFIG_INOTIFY1
usb_mtp_inotify_cleanup(s);
#endif
usb_mtp_object_free(s, QTAILQ_FIRST(&s->objects));
Expand Down Expand Up @@ -1133,7 +1134,7 @@ static void usb_mtp_handle_reset(USBDevice *dev)

trace_usb_mtp_reset(s->dev.addr);

#ifdef __linux__
#ifdef CONFIG_INOTIFY1
usb_mtp_inotify_cleanup(s);
#endif
usb_mtp_object_free(s, QTAILQ_FIRST(&s->objects));
Expand Down Expand Up @@ -1296,7 +1297,7 @@ static void usb_mtp_handle_data(USBDevice *dev, USBPacket *p)
}
break;
case EP_EVENT:
#ifdef __linux__
#ifdef CONFIG_INOTIFY1
if (!QTAILQ_EMPTY(&s->events)) {
struct MTPMonEntry *e = QTAILQ_LAST(&s->events, events);
uint32_t handle;
Expand Down
6 changes: 6 additions & 0 deletions hw/usb/hcd-ehci.c
View file
Expand Up @@ -895,6 +895,11 @@ static uint64_t ehci_caps_read(void *ptr, hwaddr addr,
return s->caps[addr];
}

static void ehci_caps_write(void *ptr, hwaddr addr,
uint64_t val, unsigned size)
{
}

static uint64_t ehci_opreg_read(void *ptr, hwaddr addr,
unsigned size)
{
Expand Down Expand Up @@ -2315,6 +2320,7 @@ static void ehci_frame_timer(void *opaque)

static const MemoryRegionOps ehci_mmio_caps_ops = {
.read = ehci_caps_read,
.write = ehci_caps_write,
.valid.min_access_size = 1,
.valid.max_access_size = 4,
.impl.min_access_size = 1,
Expand Down
6 changes: 4 additions & 2 deletions hw/usb/hcd-xhci.c
View file
Expand Up @@ -698,11 +698,13 @@ static inline void xhci_dma_write_u32s(XHCIState *xhci, dma_addr_t addr,
uint32_t *buf, size_t len)
{
int i;
uint32_t tmp[len / sizeof(uint32_t)];
uint32_t tmp[5];
uint32_t n = len / sizeof(uint32_t);

assert((len % sizeof(uint32_t)) == 0);
assert(n <= ARRAY_SIZE(tmp));

for (i = 0; i < (len / sizeof(uint32_t)); i++) {
for (i = 0; i < n; i++) {
tmp[i] = cpu_to_le32(buf[i]);
}
pci_dma_write(PCI_DEVICE(xhci), addr, tmp, len);
Expand Down
4 changes: 3 additions & 1 deletion hw/usb/redirect.c
View file
Expand Up @@ -34,12 +34,14 @@
#include "qemu/iov.h"
#include "sysemu/char.h"

#include <sys/ioctl.h>
#include <usbredirparser.h>
#include <usbredirfilter.h>

#include "hw/usb.h"

/* ERROR is defined below. Remove any previous definition. */
#undef ERROR

#define MAX_ENDPOINTS 32
#define NO_INTERFACE_INFO 255 /* Valid interface_count always <= 32 */
#define EP2I(ep_address) (((ep_address & 0x80) >> 3) | (ep_address & 0x0f))
Expand Down

0 comments on commit ac0d25e

Please sign in to comment.