From owner-svn-src-stable-9@FreeBSD.ORG  Tue Sep 25 13:32:06 2012
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 06396106564A;
	Tue, 25 Sep 2012 13:32:06 +0000 (UTC)
	(envelope-from tijl@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E484D8FC0A;
	Tue, 25 Sep 2012 13:32:05 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8PDW5X0037505;
	Tue, 25 Sep 2012 13:32:05 GMT (envelope-from tijl@svn.freebsd.org)
Received: (from tijl@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8PDW57L037503;
	Tue, 25 Sep 2012 13:32:05 GMT (envelope-from tijl@svn.freebsd.org)
Message-Id: <201209251332.q8PDW57L037503@svn.freebsd.org>
From: Tijl Coosemans <tijl@FreeBSD.org>
Date: Tue, 25 Sep 2012 13:32:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r240919 - stable/9/sys/cam/scsi
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
	<svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 25 Sep 2012 13:32:06 -0000

Author: tijl
Date: Tue Sep 25 13:32:05 2012
New Revision: 240919
URL: http://svn.freebsd.org/changeset/base/240919

Log:
  MFC r240701:
  
  Fix a panic when trying to play invalid audio tracks.
  
  PR:		kern/167340
  Reported by:	Michael L. Semon <mlsemon35 gmail com>

Modified:
  stable/9/sys/cam/scsi/scsi_cd.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/cam/scsi/scsi_cd.c
==============================================================================
--- stable/9/sys/cam/scsi/scsi_cd.c	Tue Sep 25 12:45:41 2012	(r240918)
+++ stable/9/sys/cam/scsi/scsi_cd.c	Tue Sep 25 13:32:05 2012	(r240919)
@@ -1990,6 +1990,7 @@ cdioctl(struct disk *dp, u_long cmd, voi
 			 	 || (st > (softc->toc.header.ending_track -
 				     softc->toc.header.starting_track))) {
 					error = EINVAL;
+					cam_periph_unlock(periph);
 					break;
 				}
 				sentry = &softc->toc.entries[st].addr;