diff options
| author | maya <maya@NetBSD.org> | 2019-10-31 11:59:40 +0000 |
|---|---|---|
| committer | maya <maya@NetBSD.org> | 2019-10-31 11:59:40 +0000 |
| commit | 0dfabda17224ea16540fa586459f2d82a5cb9c5c (patch) | |
| tree | b4461c15eb8c0ffb5b69c823be70e66ab4998aeb /sys/dev | |
| parent | 0644a0a6037917a9864b9c918081c867cf229995 (diff) | |
check if buf/bufsz are non-NULL before freeing.
not all control messages that can be received result in buf being
initialized, we might get a spurious different control message
seen in practice when swapping modes a few times on a urndis device
urndis0: SAMSUNG ...
autoconfiguration error: urndis0: invalid address
panic: kernel diagnostic assertion "p != NULL" failed: file "/cvs/src/sys/kern/subr_kmem.c", line 263
cpu0: Begin traceback...
vpanic() at netbsd:vpanic+0x178
kern_assert() at netbsd:kern_assert+0x48
kmem_intr_free() at netbsd:kmem_intr_free+0xca
urndis_attach() at netbsd:urndis_attach+0x4c2
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/usb/if_urndis.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sys/dev/usb/if_urndis.c b/sys/dev/usb/if_urndis.c index ff37bf2f0e2..dbdd14db002 100644 --- a/sys/dev/usb/if_urndis.c +++ b/sys/dev/usb/if_urndis.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_urndis.c,v 1.33 2019/08/20 06:37:06 mrg Exp $ */ +/* $NetBSD: if_urndis.c,v 1.34 2019/10/31 11:59:40 maya Exp $ */ /* $OpenBSD: if_urndis.c,v 1.31 2011/07/03 15:47:17 matthew Exp $ */ /* @@ -21,7 +21,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_urndis.c,v 1.33 2019/08/20 06:37:06 mrg Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_urndis.c,v 1.34 2019/10/31 11:59:40 maya Exp $"); #ifdef _KERNEL_OPT #include "opt_usb.h" @@ -1068,7 +1068,8 @@ urndis_attach(device_t parent, device_t self, void *aux) kmem_free(buf, bufsz); } else { aprint_error("%s: invalid address\n", DEVNAME(un)); - kmem_free(buf, bufsz); + if (buf && bufsz) + kmem_free(buf, bufsz); usbnet_lock(un); usbnet_stop(un, ifp, 1); usbnet_unlock(un); |
