diff options
| author | jdc <jdc@NetBSD.org> | 2012-05-18 07:52:54 +0000 |
|---|---|---|
| committer | jdc <jdc@NetBSD.org> | 2012-05-18 07:52:54 +0000 |
| commit | b3ba73b54a5e55ece2060b0a5ef65a94ebfd68ea (patch) | |
| tree | 7c212cd9b1ce80f8f3656639d682eece6cacc5e6 /sys/dev/usb | |
| parent | 1231d4561eee31f3e0914d3533545741ea58d60c (diff) | |
Increase the number of frequencies in the usb_audio_streaming_type1_descriptor
to be the same number that we support elsewhere (AUFMT_MAX_FREQUENCIES).
Set frequency_type to be AUFMT_MAX_FREQUENCIES in the case where a uaudio
device reports more frequencies than we handle.
Fixes a crash in uaudio_chan_ptransfer() because we read uninitialised data
in uaudio_identify_as().
Diffstat (limited to 'sys/dev/usb')
| -rw-r--r-- | sys/dev/usb/uaudio.c | 12 | ||||
| -rw-r--r-- | sys/dev/usb/uaudioreg.h | 4 | ||||
| -rw-r--r-- | sys/dev/usb/umidi.c | 5 | ||||
| -rw-r--r-- | sys/dev/usb/umidi_quirks.c | 5 |
4 files changed, 12 insertions, 14 deletions
diff --git a/sys/dev/usb/uaudio.c b/sys/dev/usb/uaudio.c index 0c7455450c0..69a417e4cce 100644 --- a/sys/dev/usb/uaudio.c +++ b/sys/dev/usb/uaudio.c @@ -1,4 +1,4 @@ -/* $NetBSD: uaudio.c,v 1.131 2012/04/22 01:31:48 jakllsch Exp $ */ +/* $NetBSD: uaudio.c,v 1.132 2012/05/18 07:52:54 jdc Exp $ */ /* * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: uaudio.c,v 1.131 2012/04/22 01:31:48 jakllsch Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uaudio.c,v 1.132 2012/05/18 07:52:54 jdc Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -1847,12 +1847,8 @@ uaudio_identify_as(struct uaudio_softc *sc, aprint_error("%s: please increase " "AUFMT_MAX_FREQUENCIES to %d\n", __func__, t1desc->bSamFreqType); - break; - } - if (j >= 2) { - aprint_error("%s: too much tSamFreq: " - "%d\n", - __func__, t1desc->bSamFreqType); + auf->frequency_type = + AUFMT_MAX_FREQUENCIES; break; } auf->frequency[j] = UA_GETSAMP(t1desc, j); diff --git a/sys/dev/usb/uaudioreg.h b/sys/dev/usb/uaudioreg.h index f05e5cbc66a..ca6ecc738d1 100644 --- a/sys/dev/usb/uaudioreg.h +++ b/sys/dev/usb/uaudioreg.h @@ -1,4 +1,4 @@ -/* $NetBSD: uaudioreg.h,v 1.15 2008/04/28 20:23:59 martin Exp $ */ +/* $NetBSD: uaudioreg.h,v 1.16 2012/05/18 07:52:54 jdc Exp $ */ /* * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -113,7 +113,7 @@ struct usb_audio_streaming_type1_descriptor { uByte bBitResolution; uByte bSamFreqType; #define UA_SAMP_CONTNUOUS 0 - uByte tSamFreq[3*2]; /* room for low and high */ + uByte tSamFreq[3*AUFMT_MAX_FREQUENCIES]; #define UA_GETSAMP(p, n) ((p)->tSamFreq[(n)*3+0] | ((p)->tSamFreq[(n)*3+1] << 8) | ((p)->tSamFreq[(n)*3+2] << 16)) #define UA_SAMP_LO(p) UA_GETSAMP(p, 0) #define UA_SAMP_HI(p) UA_GETSAMP(p, 1) diff --git a/sys/dev/usb/umidi.c b/sys/dev/usb/umidi.c index 0d4b00a43b6..d2484d3d23e 100644 --- a/sys/dev/usb/umidi.c +++ b/sys/dev/usb/umidi.c @@ -1,4 +1,4 @@ -/* $NetBSD: umidi.c,v 1.61 2012/03/11 01:06:07 mrg Exp $ */ +/* $NetBSD: umidi.c,v 1.62 2012/05/18 07:52:54 jdc Exp $ */ /* * Copyright (c) 2001, 2012 The NetBSD Foundation, Inc. * All rights reserved. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: umidi.c,v 1.61 2012/03/11 01:06:07 mrg Exp $"); +__KERNEL_RCSID(0, "$NetBSD: umidi.c,v 1.62 2012/05/18 07:52:54 jdc Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -52,6 +52,7 @@ __KERNEL_RCSID(0, "$NetBSD: umidi.c,v 1.61 2012/03/11 01:06:07 mrg Exp $"); #include <dev/usb/usbdi.h> #include <dev/usb/usbdi_util.h> +#include <dev/auconv.h> #include <dev/usb/usbdevs.h> #include <dev/usb/uaudioreg.h> #include <dev/usb/umidireg.h> diff --git a/sys/dev/usb/umidi_quirks.c b/sys/dev/usb/umidi_quirks.c index ba8075e3ae1..33f2742be9a 100644 --- a/sys/dev/usb/umidi_quirks.c +++ b/sys/dev/usb/umidi_quirks.c @@ -1,4 +1,4 @@ -/* $NetBSD: umidi_quirks.c,v 1.17 2012/02/11 05:28:30 plunky Exp $ */ +/* $NetBSD: umidi_quirks.c,v 1.18 2012/05/18 07:52:54 jdc Exp $ */ /* * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: umidi_quirks.c,v 1.17 2012/02/11 05:28:30 plunky Exp $"); +__KERNEL_RCSID(0, "$NetBSD: umidi_quirks.c,v 1.18 2012/05/18 07:52:54 jdc Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -49,6 +49,7 @@ __KERNEL_RCSID(0, "$NetBSD: umidi_quirks.c,v 1.17 2012/02/11 05:28:30 plunky Exp #include <dev/usb/usbdi.h> #include <dev/usb/usbdi_util.h> +#include <dev/auconv.h> #include <dev/usb/usbdevs.h> #include <dev/usb/uaudioreg.h> #include <dev/usb/umidireg.h> |
