From owner-p4-projects@FreeBSD.ORG  Fri Nov 28 18:07:52 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id EDAAE106567C; Fri, 28 Nov 2008 18:07:51 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B20D0106567A
	for <perforce@FreeBSD.org>; Fri, 28 Nov 2008 18:07:51 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id A2F028FC1B
	for <perforce@FreeBSD.org>; Fri, 28 Nov 2008 18:07:51 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mASI7pj4071782
	for <perforce@FreeBSD.org>; Fri, 28 Nov 2008 18:07:51 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mASI7pL5071780
	for perforce@freebsd.org; Fri, 28 Nov 2008 18:07:51 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Fri, 28 Nov 2008 18:07:51 GMT
Message-Id: <200811281807.mASI7pL5071780@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 153699 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 28 Nov 2008 18:07:52 -0000

http://perforce.freebsd.org/chv.cgi?CH=153699

Change 153699 by hselasky@hselasky_laptop001 on 2008/11/28 18:07:44

	
	Fix errornous parsing of USB audio mixer data.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb2/sound/uaudio2.c#21 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb2/sound/uaudio2.c#21 (text+ko) ====

@@ -2656,7 +2656,10 @@
 		DPRINTF("invalid Audio Control header\n");
 		goto done;
 	}
-	wTotalLen = UGETW(cd->wTotalLength);
+	/* "wTotalLen" is allowed to be corrupt */
+	wTotalLen = UGETW(acdp->wTotalLength) - acdp->bLength;
+
+	/* get USB audio revision */
 	sc->sc_audio_rev = UGETW(acdp->bcdADC);
 
 	DPRINTFN(3, "found AC header, vers=%03x, len=%d\n",