diff options
| author | kan <kan@FreeBSD.org> | 2009-03-23 01:24:17 +0000 |
|---|---|---|
| committer | kan <kan@FreeBSD.org> | 2009-03-23 01:24:17 +0000 |
| commit | d157f3762857dbf8a225d24b0a03b47576e8fbd1 (patch) | |
| tree | a1dcbe815a1717ae1e2a2ea981df85cfd6fe91c8 | |
| parent | ab12866f38f18e071995e52a067aa9aa8060e393 (diff) | |
| download | FreeBSD-src-d157f3762857dbf8a225d24b0a03b47576e8fbd1.zip FreeBSD-src-d157f3762857dbf8a225d24b0a03b47576e8fbd1.tar.gz | |
Do not pass uninitialized data buffer to devctl_queue_data function.
This was botched in revision 190191.
| -rw-r--r-- | sys/dev/usb/usb_device.c | 51 |
1 files changed, 25 insertions, 26 deletions
diff --git a/sys/dev/usb/usb_device.c b/sys/dev/usb/usb_device.c index b0790b4..f9c6a2e 100644 --- a/sys/dev/usb/usb_device.c +++ b/sys/dev/usb/usb_device.c @@ -2265,35 +2265,34 @@ usb2_notify_addq(const char *type, struct usb2_device *udev) return; /* String it all together. */ - if (udev->parent_hub) { - snprintf(data, 1024, - "%s" - "%s " - "vendor=0x%04x " - "product=0x%04x " - "devclass=0x%02x " - "devsubclass=0x%02x " - "sernum=\"%s\" " - "at " - "port=%u " - "on " - "%s\n", - type, - udev->ugen_name, - UGETW(udev->ddesc.idVendor), - UGETW(udev->ddesc.idProduct), - udev->ddesc.bDeviceClass, - udev->ddesc.bDeviceSubClass, + snprintf(data, 1024, + "%s" + "%s " + "vendor=0x%04x " + "product=0x%04x " + "devclass=0x%02x " + "devsubclass=0x%02x " + "sernum=\"%s\" " + "at " + "port=%u " + "on " + "%s\n", + type, + udev->ugen_name, + UGETW(udev->ddesc.idVendor), + UGETW(udev->ddesc.idProduct), + udev->ddesc.bDeviceClass, + udev->ddesc.bDeviceSubClass, #if USB_HAVE_STRINGS - udev->serial, + udev->serial, #else - "", + "", #endif - udev->port_no, - udev->parent_hub != NULL ? - udev->parent_hub->ugen_name : - device_get_nameunit(device_get_parent(udev->bus->bdev))); - } + udev->port_no, + udev->parent_hub != NULL ? + udev->parent_hub->ugen_name : + device_get_nameunit(device_get_parent(udev->bus->bdev))); + devctl_queue_data(data); } |
