X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=extras%2Fcdrom_id%2Fcdrom_id.c;h=1b43fe43ae8decf378d7969a96bac5c470f61172;hb=1ebd2a5620c93ef4698485d392c19ded675412d2;hp=f9d6e0bc24fe574aef4cc86189b516e553892567;hpb=b367a1c9d8a0f565effcdb45f86a365be1c8b622;p=elogind.git

diff --git a/extras/cdrom_id/cdrom_id.c b/extras/cdrom_id/cdrom_id.c
index f9d6e0bc2..1b43fe43a 100644
--- a/extras/cdrom_id/cdrom_id.c
+++ b/extras/cdrom_id/cdrom_id.c
@@ -297,14 +297,9 @@ static int feature_profiles(struct udev *udev, const unsigned char *profiles, si
 			cd_dvd_ram = 1;
 			break;
 		case 0x13:
-			info(udev, "profile 0x%02x media_dvd_rw\n", profile);
-			cd_media_dvd_rw = 1;
-			cd_media_dvd_rw_ro = 1;
-			break;
 		case 0x14:
 			info(udev, "profile 0x%02x dvd_rw\n", profile);
 			cd_dvd_rw = 1;
-			cd_media_dvd_rw_seq = 1;
 			break;
 		case 0x1B:
 			info(udev, "profile 0x%02x dvd_plus_r\n", profile);
@@ -369,8 +364,14 @@ static int cd_profiles_old_mmc(struct udev *udev, int fd)
 	err = scsi_cmd_run(udev, &sc, fd, header, sizeof(header));
 	if ((err != 0)) {
 		info_scsi_cmd_err(udev, "READ DISC INFORMATION", err);
-		info(udev, "no current profile, assuming no media\n");
-		return -1;
+		if (cd_media == 1) {
+			info(udev, "no current profile, but disc is present; assuming CD-ROM\n");
+			cd_media_cd_rom = 1;
+			return 0;
+		} else {
+			info(udev, "no current profile, assuming no media\n");
+			return -1;
+		}
 	};
 
 	cd_media = 1;
@@ -486,10 +487,16 @@ static int cd_profiles(struct udev *udev, int fd)
 		cd_media_dvd_ram = 1;
 		break;
 	case 0x13:
+		info(udev, "profile 0x%02x media_dvd_rw_ro\n", cur_profile);
+		cd_media = 1;
+		cd_media_dvd_rw = 1;
+		cd_media_dvd_rw_ro = 1;
+		break;
 	case 0x14:
-		info(udev, "profile 0x%02x media_dvd_rw\n", cur_profile);
+		info(udev, "profile 0x%02x media_dvd_rw_seq\n", cur_profile);
 		cd_media = 1;
 		cd_media_dvd_rw = 1;
+		cd_media_dvd_rw_seq = 1;
 		break;
 	case 0x1B:
 		info(udev, "profile 0x%02x media_dvd_plus_r\n", cur_profile);
@@ -589,7 +596,7 @@ static int cd_media_info(struct udev *udev, int fd)
 	 * always "complete", DVD-RAM are "other" or "complete" if the disc is
 	 * write protected; we need to check the contents if it is blank */
 	if ((cd_media_dvd_rw_ro || cd_media_dvd_plus_rw || cd_media_dvd_plus_rw_dl || cd_media_dvd_ram) && (header[2] & 3) > 1) {
-		unsigned char buffer[17 * 2048];
+		unsigned char buffer[32 * 2048];
 		unsigned char result, len;
 		int block, offset;
 
@@ -660,7 +667,7 @@ static int cd_media_info(struct udev *udev, int fd)
 		scsi_cmd_init(udev, &sc, buffer, sizeof(buffer));
 		scsi_cmd_set(udev, &sc, 0, 0x28);
 		scsi_cmd_set(udev, &sc, 5, 0);
-		scsi_cmd_set(udev, &sc, 8, 17);
+		scsi_cmd_set(udev, &sc, 8, 32);
 		scsi_cmd_set(udev, &sc, 9, 0);
 		err = scsi_cmd_run(udev, &sc, fd, buffer, sizeof(buffer));
 		if ((err != 0)) {
@@ -705,7 +712,7 @@ static int cd_media_toc(struct udev *udev, int fd)
 	struct scsi_cmd sc;
 	unsigned char header[12];
 	unsigned char toc[2048];
-	unsigned int len, i;
+	unsigned int len, i, num_tracks;
 	unsigned char *p;
 	int err;
 
@@ -721,11 +728,13 @@ static int cd_media_toc(struct udev *udev, int fd)
 	}
 
 	len = (header[0] << 8 | header[1]) + 2;
-	info(udev, "READ TOC: len: %d\n", len);
+	info(udev, "READ TOC: len: %d, start track: %d, end track: %d\n", len, header[2], header[3]);
 	if (len > sizeof(toc))
 		return -1;
 	if (len < 2)
 		return -1;
+	/* 2: first track, 3: last track */
+	num_tracks = header[3] - header[2] + 1;
 
 	/* empty media has no tracks */
 	if (len < 8)
@@ -743,7 +752,10 @@ static int cd_media_toc(struct udev *udev, int fd)
 		return -1;
 	}
 
-	for (p = toc+4, i = 4; i < len-8; i += 8, p += 8) {
+	/* Take care to not iterate beyond the last valid track as specified in
+	 * the TOC, but also avoid going beyond the TOC length, just in case
+	 * the last track number is invalidly large */
+	for (p = toc+4, i = 4; i < len-8 && num_tracks > 0; i += 8, p += 8, --num_tracks) {
 		unsigned int block;
 		unsigned int is_data_track;