Module Name: src
Committed By: snj
Date: Thu Jan 21 08:41:01 UTC 2010
Modified Files:
src/sys/dev/pci [netbsd-5-0]: azalia.c
Log Message:
Pull up following revision(s) (requested by tonnerre in ticket #1258):
sys/dev/pci/azalia.c: revision 1.72
Signedness bug/crash in azalia. Fixes PR 42604.
By Pierre Pronchery.
To generate a diff of this commit:
cvs rdiff -u -r1.64.6.1 -r1.64.6.1.2.1 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.64.6.1 src/sys/dev/pci/azalia.c:1.64.6.1.2.1
--- src/sys/dev/pci/azalia.c:1.64.6.1 Mon Mar 2 19:53:26 2009
+++ src/sys/dev/pci/azalia.c Thu Jan 21 08:41:00 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: azalia.c,v 1.64.6.1 2009/03/02 19:53:26 snj Exp $ */
+/* $NetBSD: azalia.c,v 1.64.6.1.2.1 2010/01/21 08:41:00 snj Exp $ */
/*-
* Copyright (c) 2005 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: azalia.c,v 1.64.6.1 2009/03/02 19:53:26 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: azalia.c,v 1.64.6.1.2.1 2010/01/21 08:41:00 snj Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -2257,7 +2257,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;
