git: 87e560496fc1 - stable/13 - ued may be NULL here which will cause a panic... reproducable by simply doing a usbconfig reset on a device which doesn't reset itself properly...
Wojciech Macek
wma at FreeBSD.org
Tue Sep 28 07:33:42 UTC 2021
The branch stable/13 has been updated by wma:
URL: https://cgit.FreeBSD.org/src/commit/?id=87e560496fc11391cd170c84b42f107f630653d5
commit 87e560496fc11391cd170c84b42f107f630653d5
Author: John-Mark Gurney <jmg at FreeBSD.org>
AuthorDate: 2021-06-29 01:09:14 +0000
Commit: Wojciech Macek <wma at FreeBSD.org>
CommitDate: 2021-09-28 07:03:48 +0000
ued may be NULL here which will cause a panic... reproducable by
simply doing a usbconfig reset on a device which doesn't reset itself
properly...
(cherry picked from commit 3d5104182c2eb4336905e89aa0d089b67aa746e3)
---
sys/dev/usb/net/if_cdce.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/sys/dev/usb/net/if_cdce.c b/sys/dev/usb/net/if_cdce.c
index 64c31896d417..24813ea305e4 100644
--- a/sys/dev/usb/net/if_cdce.c
+++ b/sys/dev/usb/net/if_cdce.c
@@ -709,18 +709,18 @@ alloc_transfers:
if ((ued == NULL) || (ued->bLength < sizeof(*ued))) {
error = USB_ERR_INVAL;
} else {
+ /*
+ * ECM 1.2 doesn't say it excludes the CRC, but states that it's
+ * normally 1514, which excludes the CRC.
+ */
+ DPRINTF("max segsize: %d\n", UGETW(ued->wMaxSegmentSize));
+ if (UGETW(ued->wMaxSegmentSize) >= (ETHER_MAX_LEN - ETHER_CRC_LEN + ETHER_VLAN_ENCAP_LEN))
+ sc->sc_flags |= CDCE_FLAG_VLAN;
+
error = usbd_req_get_string_any(uaa->device, NULL,
eaddr_str, sizeof(eaddr_str), ued->iMacAddress);
}
- /*
- * ECM 1.2 doesn't say it excludes the CRC, but states that it's
- * normally 1514, which excludes the CRC.
- */
- DPRINTF("max segsize: %d\n", UGETW(ued->wMaxSegmentSize));
- if (UGETW(ued->wMaxSegmentSize) >= (ETHER_MAX_LEN - ETHER_CRC_LEN + ETHER_VLAN_ENCAP_LEN))
- sc->sc_flags |= CDCE_FLAG_VLAN;
-
if (error) {
/* fake MAC address */
More information about the dev-commits-src-all
mailing list