Module Name: src
Committed By: maxv
Date: Sun Nov 17 11:28:48 UTC 2019
Modified Files:
src/sys/dev/usb: vhci.c
Log Message:
Not a bug strictly speaking, but compute the address only after the length
checks, for clarity and to appease kUBSan.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/usb/vhci.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/vhci.c
diff -u src/sys/dev/usb/vhci.c:1.3 src/sys/dev/usb/vhci.c:1.4
--- src/sys/dev/usb/vhci.c:1.3 Thu Oct 3 05:13:23 2019
+++ src/sys/dev/usb/vhci.c Sun Nov 17 11:28:48 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: vhci.c,v 1.3 2019/10/03 05:13:23 maxv Exp $ */
+/* $NetBSD: vhci.c,v 1.4 2019/11/17 11:28:48 maxv Exp $ */
/*
* Copyright (c) 2019 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vhci.c,v 1.3 2019/10/03 05:13:23 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vhci.c,v 1.4 2019/11/17 11:28:48 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -376,8 +376,6 @@ vhci_roothub_ctrl(struct usbd_bus *bus,
value = UGETW(req->wValue);
index = UGETW(req->wIndex);
- port = &sc->sc_port[VHCI_INDEX2PORT(index)];
-
#define C(x,y) ((x) | ((y) << 8))
switch (C(req->bRequest, req->bmRequestType)) {
case C(UR_GET_DESCRIPTOR, UT_READ_DEVICE):
@@ -414,6 +412,7 @@ vhci_roothub_ctrl(struct usbd_bus *bus,
if (index < 1 || index >= sc->sc_nports) {
return -1;
}
+ port = &sc->sc_port[VHCI_INDEX2PORT(index)];
port->status |= UPS_C_PORT_RESET;
break;
case UHF_PORT_POWER:
@@ -430,6 +429,7 @@ vhci_roothub_ctrl(struct usbd_bus *bus,
if (index < 1 || index >= sc->sc_nports) {
return -1;
}
+ port = &sc->sc_port[VHCI_INDEX2PORT(index)];
switch (value) {
case UHF_PORT_ENABLE:
port->status &= ~UPS_PORT_ENABLED;
@@ -463,6 +463,7 @@ vhci_roothub_ctrl(struct usbd_bus *bus,
if (index < 1 || index >= sc->sc_nports) {
return -1;
}
+ port = &sc->sc_port[VHCI_INDEX2PORT(index)];
USETW(ps.wPortStatus, port->status);
USETW(ps.wPortChange, port->change);
totlen = uimin(len, sizeof(ps));
