Attachment #14172 for bug #26644




	{
	    struct ioc_read_subchannel *args =
		(struct ioc_read_subchannel *)addr;
	    u_int8_t format;
	    int len = args->data_len;
	    int32_t abslba, rellba;
	    int8_t ccb[16] = { ATAPI_READ_SUBCHANNEL, 0, 0x40, 1, 0, 0, 0,
			       sizeof(cdp->subchan)>>8, sizeof(cdp->subchan),
			       0, 0, 0, 0, 0, 0, 0 };

	    if (len > sizeof(struct cd_sub_channel_info) ||
		len < sizeof(struct cd_sub_channel_header)) {
		error = EINVAL;
		break;
	    }

	    format=args->data_format;
	    if ((format != CD_CURRENT_POSITION) &&
		(format != CD_MEDIA_CATALOG) && (format != CD_TRACK_INFO)) {
		error = EINVAL;
		break;
	    }

	    ccb[1] = args->address_format & CD_MSF_FORMAT;

	    if ((error = atapi_queue_cmd(cdp->atp, ccb, (caddr_t)&cdp->subchan, 
					 sizeof(cdp->subchan), ATPR_F_READ, 10,
					 NULL, NULL))) {
		break;
	    }

	    /*
	     * Ask for media catalogue or track info only if no audio play
	     * operation is in progress or the drive will return an error.
	     */

	    if ((format == CD_MEDIA_CATALOG) || (format == CD_TRACK_INFO)) {
		if (cdp->subchan.header.audio_status == 0x11) {
		    error = EINVAL;
		    break;
		}

		ccb[3] = format;
		if (format == CD_TRACK_INFO)
		    ccb[6] = args->track;

		if ((error = atapi_queue_cmd(cdp->atp, ccb,
					     (caddr_t)&cdp->subchan, 
					     sizeof(cdp->subchan), ATPR_F_READ,
					     10, NULL, NULL))) {
		    break;
		}
	    }

	    error = copyout(&cdp->subchan, args->data, len);
	    data.what.position.addr_type = cdp->subchan.control >> 4;
	    data.what.position.track_number = cdp->subchan.track;
	    data.what.position.index_number = cdp->subchan.indx;
	    error = copyout(&data, args->data, len);
	    break;
	}





    struct audiopage		au;		/* audio page info */
    struct audiopage		aumask;		/* audio page mask */
    struct cappage		cap;		/* capabilities page info */
    struct {
	struct {
		u_int8_t	void0;
		u_int8_t	audio_status;
		u_int16_t	data_length;
	} header;
	union {					/* subchannel info */
	    struct {
		u_int8_t	data_format;
		u_int8_t	control;
		u_int8_t	track;
		u_int8_t	indx;
		u_int32_t	abslba;
		u_int32_t	rellba;
	    } position;
	    struct {
		u_int8_t	data_format;
		u_int8_t	:8;
		u_int8_t	:8;
		u_int8_t	:8;
		u_int8_t	:7;
		u_int8_t	mc_valid:1;
		u_int8_t	mc_number[15];
	    } media_catalog;
	    struct {
		u_int8_t	data_format;
		u_int8_t	control;
		u_int8_t	track;
		u_int8_t	:8;
		u_int8_t	:7;
		u_int8_t	ti_valid:1;
		u_int8_t	ti_number[15];
	    } track_info;
	} what;
    } subchan;
    struct changer		*changer_info;	/* changer info */
    struct acd_softc		**driver;	/* softc's of changer slots */

Return to bug 26644

Lines 725-769 Link Here

(-)atapi-cd.c (-23 / +35 lines)
725	{	725	{
726	struct ioc_read_subchannel *args =	726	struct ioc_read_subchannel *args =
727	(struct ioc_read_subchannel *)addr;	727	(struct ioc_read_subchannel *)addr;
728	struct cd_sub_channel_info data;	728	u_int8_t format;
729	int len = args->data_len;	729	int len = args->data_len;
730	int32_t abslba, rellba;
731	int8_t ccb[16] = { ATAPI_READ_SUBCHANNEL, 0, 0x40, 1, 0, 0, 0,	730	int8_t ccb[16] = { ATAPI_READ_SUBCHANNEL, 0, 0x40, 1, 0, 0, 0,
732	sizeof(cdp->subchan)>>8, sizeof(cdp->subchan),	731	sizeof(cdp->subchan)>>8, sizeof(cdp->subchan),
733	0, 0, 0, 0, 0, 0, 0 };	732	0, 0, 0, 0, 0, 0, 0 };
734		733
735	if (len > sizeof(data) \|\|	734	if (len > sizeof(struct cd_sub_channel_info) \|\|
736	len < sizeof(struct cd_sub_channel_header)) {	735	len < sizeof(struct cd_sub_channel_header)) {
737	error = EINVAL;	736	error = EINVAL;
738	break;	737	break;
739	}	738	}
740		739
		740	format=args->data_format;
		741	if ((format != CD_CURRENT_POSITION) &&
		742	(format != CD_MEDIA_CATALOG) && (format != CD_TRACK_INFO)) {
		743	error = EINVAL;
		744	break;
		745	}
		746
		747	ccb[1] = args->address_format & CD_MSF_FORMAT;
		748
741	if ((error = atapi_queue_cmd(cdp->atp, ccb, (caddr_t)&cdp->subchan,	749	if ((error = atapi_queue_cmd(cdp->atp, ccb, (caddr_t)&cdp->subchan,
742	sizeof(cdp->subchan), ATPR_F_READ, 10,	750	sizeof(cdp->subchan), ATPR_F_READ, 10,
743	NULL, NULL))) {	751	NULL, NULL))) {
744	break;	752	break;
745	}	753	}
746	abslba = cdp->subchan.abslba;	754
747	rellba = cdp->subchan.rellba;	755	/*
748	if (args->address_format == CD_MSF_FORMAT) {	756	* Ask for media catalogue or track info only if no audio play
749	lba2msf(ntohl(abslba),	757	* operation is in progress or the drive will return an error.
750	&data.what.position.absaddr.msf.minute,	758	*/
751	&data.what.position.absaddr.msf.second,	759
752	&data.what.position.absaddr.msf.frame);	760	if ((format == CD_MEDIA_CATALOG) \|\| (format == CD_TRACK_INFO)) {
753	lba2msf(ntohl(rellba),	761	if (cdp->subchan.header.audio_status == 0x11) {
754	&data.what.position.reladdr.msf.minute,	762	error = EINVAL;
755	&data.what.position.reladdr.msf.second,	763	break;
756	&data.what.position.reladdr.msf.frame);	764	}
757	} else {	765
758	data.what.position.absaddr.lba = abslba;	766	ccb[3] = format;
759	data.what.position.reladdr.lba = rellba;	767	if (format == CD_TRACK_INFO)
		768	ccb[6] = args->track;
		769
		770	if ((error = atapi_queue_cmd(cdp->atp, ccb,
		771	(caddr_t)&cdp->subchan,
		772	sizeof(cdp->subchan), ATPR_F_READ,
		773	10, NULL, NULL))) {
		774	break;
		775	}
760	}	776	}
761	data.header.audio_status = cdp->subchan.audio_status;	777
762	data.what.position.control = cdp->subchan.control & 0xf;	778	error = copyout(&cdp->subchan, args->data, len);
763	data.what.position.addr_type = cdp->subchan.control >> 4;
764	data.what.position.track_number = cdp->subchan.track;
765	data.what.position.index_number = cdp->subchan.indx;
766	error = copyout(&data, args->data, len);
767	break;	779	break;
768	}	780	}
769		781

Lines 311-326 Link Here

(-)atapi-cd.h (-10 / +34 lines)
311	struct audiopage au; /* audio page info */	311	struct audiopage au; /* audio page info */
312	struct audiopage aumask; /* audio page mask */	312	struct audiopage aumask; /* audio page mask */
313	struct cappage cap; /* capabilities page info */	313	struct cappage cap; /* capabilities page info */
314	struct { /* subchannel info */	314	struct {
315	u_int8_t void0;	315	struct {
316	u_int8_t audio_status;	316	u_int8_t void0;
317	u_int16_t data_length;	317	u_int8_t audio_status;
318	u_int8_t data_format;	318	u_int16_t data_length;
319	u_int8_t control;	319	} header;
320	u_int8_t track;	320	union { /* subchannel info */
321	u_int8_t indx;	321	struct {
322	u_int32_t abslba;	322	u_int8_t data_format;
323	u_int32_t rellba;	323	u_int8_t control;
		324	u_int8_t track;
		325	u_int8_t indx;
		326	u_int32_t abslba;
		327	u_int32_t rellba;
		328	} position;
		329	struct {
		330	u_int8_t data_format;
		331	u_int8_t :8;
		332	u_int8_t :8;
		333	u_int8_t :8;
		334	u_int8_t :7;
		335	u_int8_t mc_valid:1;
		336	u_int8_t mc_number[15];
		337	} media_catalog;
		338	struct {
		339	u_int8_t data_format;
		340	u_int8_t control;
		341	u_int8_t track;
		342	u_int8_t :8;
		343	u_int8_t :7;
		344	u_int8_t ti_valid:1;
		345	u_int8_t ti_number[15];
		346	} track_info;
		347	} what;
324	} subchan;	348	} subchan;
325	struct changer changer_info; / changer info */	349	struct changer changer_info; / changer info */
326	struct acd_softc *driver; / softc's of changer slots */	350	struct acd_softc *driver; / softc's of changer slots */