Module Name: src
Committed By: maxv
Date: Sun Sep 15 09:18:17 UTC 2019
Modified Files:
src/sys/dev/usb: umidi.c
Log Message:
Don't kmem_alloc(0) if there are no endpoints, otherwise panic. Found via
vHCI.
To generate a diff of this commit:
cvs rdiff -u -r1.78 -r1.79 src/sys/dev/usb/umidi.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/umidi.c
diff -u src/sys/dev/usb/umidi.c:1.78 src/sys/dev/usb/umidi.c:1.79
--- src/sys/dev/usb/umidi.c:1.78 Wed May 8 13:40:19 2019
+++ src/sys/dev/usb/umidi.c Sun Sep 15 09:18:17 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: umidi.c,v 1.78 2019/05/08 13:40:19 isaki Exp $ */
+/* $NetBSD: umidi.c,v 1.79 2019/09/15 09:18:17 maxv Exp $ */
/*
* Copyright (c) 2001, 2012, 2014 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umidi.c,v 1.78 2019/05/08 13:40:19 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umidi.c,v 1.79 2019/09/15 09:18:17 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -966,6 +966,8 @@ alloc_all_endpoints_genuine(struct umidi
interface_desc = usbd_get_interface_descriptor(sc->sc_iface);
num_ep = interface_desc->bNumEndpoints;
+ if (num_ep == 0)
+ return USBD_INVAL;
sc->sc_endpoints_len = sizeof(struct umidi_endpoint) * num_ep;
sc->sc_endpoints = p = kmem_zalloc(sc->sc_endpoints_len, KM_SLEEP);
sc->sc_out_num_jacks = sc->sc_in_num_jacks = 0;
