svn commit: r240919 - stable/9/sys/cam/scsi

Tijl Coosemans tijl at FreeBSD.org
Tue Sep 25 13:32:06 UTC 2012


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;


More information about the svn-src-stable-9 mailing list