d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix two more PRs:

Browse Source 
(1) Add size parameter to usbd_get_string()
(2) Properly limit speed when a full speed hub is plugged into a high
    speed hub.

Submitted by: Hans Petter Selasky
PR: 80773, 79725
Approved by: re@ (kensmith)
This commit is contained in:
Warner Losh 2007-06-30 20:18:44 +00:00
parent 1371adb3ca
commit c78c2f1bd2
5 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/dev/usb/if_cdce.c
View File

@ -280,7 +280,8 @@ cdce_attach(device_t self)
ue = (const usb_cdc_ethernet_descriptor_t *)usb_find_desc(dev,
UDESC_INTERFACE, UDESCSUB_CDC_ENF);
if (!ue || usbd_get_string(dev, ue->iMacAddress, eaddr_str)) {
if (!ue || usbd_get_string(dev, ue->iMacAddress, eaddr_str,
sizeof(eaddr_str))) {
/* Fake MAC address */
device_printf(sc->cdce_dev, "faking MAC address\n");
eaddr[0]= 0x2a;

3
sys/dev/usb/uhub.c
View File

@ -655,7 +655,8 @@ uhub_child_pnpinfo_str(device_t cbdev, device_t child, char *buf,
found_dev:
/* XXX can sleep */
(void)usbd_get_string(dev, dev->ddesc.iSerialNumber, &serial[0]);
(void)usbd_get_string(dev, dev->ddesc.iSerialNumber, serial,
sizeof(serial));
if (dev->ifacenums == NULL) {
snprintf(buf, buflen, "vendor=0x%04x product=0x%04x "
"devclass=0x%02x devsubclass=0x%02x "

20
sys/dev/usb/usb_subr.c
View File

@ -213,12 +213,14 @@ usbd_devinfo_vp(usbd_device_handle dev, char *v, char *p, int usedev)
}
if (usedev) {
if (usbd_get_string(dev, udd->iManufacturer, v))
if (usbd_get_string(dev, udd->iManufacturer, v,
USB_MAX_STRING_LEN))
vendor = NULL;
else
vendor = v;
usbd_trim_spaces(vendor);
if (usbd_get_string(dev, udd->iProduct, p))
if (usbd_get_string(dev, udd->iProduct, p,
USB_MAX_STRING_LEN))
product = NULL;
else
product = p;
@ -1052,6 +1054,20 @@ usbd_new_device(device_t parent, usbd_bus_handle bus, int depth,
up->device = dev;
if (up->parent && speed > up->parent->speed) {
#ifdef USB_DEBUG
printf("%s: maxium speed of attached "
"device, %d, is higher than speed "
"of parent HUB, %d.\n",
__FUNCTION__, speed, up->parent->speed);
#endif
/*
* Reduce the speed, otherwise we won't setup the
* proper transfer methods.
*/
speed = up->parent->speed;
}
/* Locate port on upstream high speed hub */
for (adev = dev, hub = up->parent;
hub != NULL && hub->speed != USB_SPEED_HIGH;

6
sys/dev/usb/usbdi.c
View File

@ -1310,7 +1310,7 @@ usb_desc_iter_next(usbd_desc_iter_t *iter)
}
usbd_status
usbd_get_string(usbd_device_handle dev, int si, char *buf)
usbd_get_string(usbd_device_handle dev, int si, char *buf, size_t len)
{
int swap = dev->quirks->uq_flags & UQ_SWAP_UNICODE;
usb_string_descriptor_t us;
@ -1321,6 +1321,8 @@ usbd_get_string(usbd_device_handle dev, int si, char *buf)
int size;
buf[0] = '\0';
if (len == 0)
return (USBD_NORMAL_COMPLETION);
if (si == 0)
return (USBD_INVAL);
if (dev->quirks->uq_flags & UQ_NO_STRINGS)
@ -1342,7 +1344,7 @@ usbd_get_string(usbd_device_handle dev, int si, char *buf)
return (err);
s = buf;
n = size / 2 - 1;
for (i = 0; i < n; i++) {
for (i = 0; i < n && i < len - 1; i++) {
c = UGETW(us.bString[i]);
/* Convert from Unicode, handle buggy strings. */
if ((c & 0xff00) == 0)

3
sys/dev/usb/usbdi.h
View File

@ -173,7 +173,8 @@ usbd_status usbd_reload_device_desc(usbd_device_handle);
int usbd_ratecheck(struct timeval *last);
usbd_status usbd_get_string(usbd_device_handle dev, int si, char *buf);
usbd_status usbd_get_string(usbd_device_handle dev, int si, char *buf,
size_t len);
/* An iterator for descriptors. */
typedef struct {