Module Name: src
Committed By: maya
Date: Wed Oct 23 00:52:39 UTC 2019
Modified Files:
src/sys/dev/usb: uvideo.c
Log Message:
Avoid kmem_alloc(0,..), which hits an assertion.
PR kern/53734: Prevent kernel panic during Wide Vision FHD Camera detection
To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 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.49 src/sys/dev/usb/uvideo.c:1.50
--- src/sys/dev/usb/uvideo.c:1.49 Tue Oct 1 18:00:08 2019
+++ src/sys/dev/usb/uvideo.c Wed Oct 23 00:52:39 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: uvideo.c,v 1.49 2019/10/01 18:00:08 chs Exp $ */
+/* $NetBSD: uvideo.c,v 1.50 2019/10/23 00:52:39 maya Exp $ */
/*
* Copyright (c) 2008 Patrick Mahoney
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvideo.c,v 1.49 2019/10/01 18:00:08 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvideo.c,v 1.50 2019/10/23 00:52:39 maya Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -999,6 +999,9 @@ static usbd_status
uvideo_unit_alloc_controls(struct uvideo_unit *vu, uint8_t size,
const uint8_t *controls)
{
+ if (vu->vu_controls == 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);
