Module Name: src
Committed By: martin
Date: Sun Dec 29 11:13:48 UTC 2019
Modified Files:
src/sys/dev/usb [netbsd-9]: uvideo.c
Log Message:
Pull up following revision(s) (requested by mlelstv in ticket #590):
sys/dev/usb/uvideo.c: revision 1.50
sys/dev/usb/uvideo.c: revision 1.51
sys/dev/usb/uvideo.c: revision 1.52
Avoid kmem_alloc(0,..), which hits an assertion.
PR kern/53734: Prevent kernel panic during Wide Vision FHD Camera detection
Check if size is zero, too.
PR kern/53734
we want to check that the allocation is going to be zero, not whether
some pointer is NULL (oops).
Should be the right version this time!
To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.47.2.1 src/sys/dev/usb/uvideo.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/uvideo.c
diff -u src/sys/dev/usb/uvideo.c:1.47 src/sys/dev/usb/uvideo.c:1.47.2.1
--- src/sys/dev/usb/uvideo.c:1.47 Sun May 5 03:17:54 2019
+++ src/sys/dev/usb/uvideo.c Sun Dec 29 11:13:48 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: uvideo.c,v 1.47 2019/05/05 03:17:54 mrg Exp $ */
+/* $NetBSD: uvideo.c,v 1.47.2.1 2019/12/29 11:13:48 martin Exp $ */
/*
* Copyright (c) 2008 Patrick Mahoney
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvideo.c,v 1.47 2019/05/05 03:17:54 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvideo.c,v 1.47.2.1 2019/12/29 11:13:48 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -989,6 +989,9 @@ static usbd_status
uvideo_unit_alloc_controls(struct uvideo_unit *vu, uint8_t size,
const uint8_t *controls)
{
+ if (size == 0)
+ return USBD_INVAL;
+
vu->vu_controls = kmem_alloc(sizeof(*vu->vu_controls) * size, KM_SLEEP);
vu->vu_control_size = size;
memcpy(vu->vu_controls, controls, size);
