Module Name: src Committed By: bouyer Date: Wed Dec 11 11:54:23 UTC 2019
Modified Files: src/sys/dev/usb: ugen.c Log Message: reading usbdi.c it looks like usbd_get_config_descriptor() can actually return NULL, so check for this. I got NULL pointer dereference here with a device showing: [ 303.732632] ugen0: autoconfiguration error: setting configuration index 0 failed To generate a diff of this commit: cvs rdiff -u -r1.147 -r1.148 src/sys/dev/usb/ugen.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/ugen.c diff -u src/sys/dev/usb/ugen.c:1.147 src/sys/dev/usb/ugen.c:1.148 --- src/sys/dev/usb/ugen.c:1.147 Sun Dec 1 08:27:54 2019 +++ src/sys/dev/usb/ugen.c Wed Dec 11 11:54:23 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: ugen.c,v 1.147 2019/12/01 08:27:54 maxv Exp $ */ +/* $NetBSD: ugen.c,v 1.148 2019/12/11 11:54:23 bouyer Exp $ */ /* * Copyright (c) 1998, 2004 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ugen.c,v 1.147 2019/12/01 08:27:54 maxv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ugen.c,v 1.148 2019/12/11 11:54:23 bouyer Exp $"); #ifdef _KERNEL_OPT #include "opt_compat_netbsd.h" @@ -1406,6 +1406,8 @@ ugen_get_cdesc(struct ugen_softc *sc, in if (index == USB_CURRENT_CONFIG_INDEX) { tdesc = usbd_get_config_descriptor(sc->sc_udev); + if (tdesc == NULL) + return NULL; len = UGETW(tdesc->wTotalLength); if (lenp) *lenp = len;