From owner-svn-src-head@FreeBSD.ORG  Wed Sep 19 18:42:32 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 89EF1106564A;
	Wed, 19 Sep 2012 18:42:32 +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 758788FC08;
	Wed, 19 Sep 2012 18:42:32 +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 q8JIgWBB046271;
	Wed, 19 Sep 2012 18:42:32 GMT (envelope-from tijl@svn.freebsd.org)
Received: (from tijl@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8JIgW2S046269;
	Wed, 19 Sep 2012 18:42:32 GMT (envelope-from tijl@svn.freebsd.org)
Message-Id: <201209191842.q8JIgW2S046269@svn.freebsd.org>
From: Tijl Coosemans <tijl@FreeBSD.org>
Date: Wed, 19 Sep 2012 18:42:32 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r240701 - head/sys/cam/scsi
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 19 Sep 2012 18:42:32 -0000

Author: tijl
Date: Wed Sep 19 18:42:31 2012
New Revision: 240701
URL: http://svn.freebsd.org/changeset/base/240701

Log:
  Fix a panic when trying to play invalid audio tracks.

Modified:
  head/sys/cam/scsi/scsi_cd.c

Modified: head/sys/cam/scsi/scsi_cd.c
==============================================================================
--- head/sys/cam/scsi/scsi_cd.c	Wed Sep 19 18:25:25 2012	(r240700)
+++ head/sys/cam/scsi/scsi_cd.c	Wed Sep 19 18:42:31 2012	(r240701)
@@ -2080,6 +2080,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;