Module Name: src
Committed By: snj
Date: Thu Jan 21 08:34:27 UTC 2010
Modified Files:
src/sys/dev/pci [netbsd-4]: azalia.c
Log Message:
Apply patch (requested by tonnerre in ticket #1375):
Signedness bug/crash in azalia. Fixes PR 42604.
To generate a diff of this commit:
cvs rdiff -u -r1.42.2.1 -r1.42.2.2 src/sys/dev/pci/azalia.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/pci/azalia.c
diff -u src/sys/dev/pci/azalia.c:1.42.2.1 src/sys/dev/pci/azalia.c:1.42.2.2
--- src/sys/dev/pci/azalia.c:1.42.2.1 Sun May 20 09:57:08 2007
+++ src/sys/dev/pci/azalia.c Thu Jan 21 08:34:27 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: azalia.c,v 1.42.2.1 2007/05/20 09:57:08 jdc Exp $ */
+/* $NetBSD: azalia.c,v 1.42.2.2 2010/01/21 08:34:27 snj Exp $ */
/*-
* Copyright (c) 2005 The NetBSD Foundation, Inc.
@@ -48,7 +48,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: azalia.c,v 1.42.2.1 2007/05/20 09:57:08 jdc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: azalia.c,v 1.42.2.2 2010/01/21 08:34:27 snj Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -2137,7 +2137,7 @@
az = v;
co = &az->codecs[az->codecno];
- if (mdev->index >= co->nmixers)
+ if (mdev->index < 0 || mdev->index >= co->nmixers)
return ENXIO;
*mdev = co->mixers[mdev->index].devinfo;
return 0;