kern/89650: [patch] acd returns incorrect DVD region info (rmi)

[James E. Flemer]

>Number:         89650
>Category:       kern
>Synopsis:       [patch] acd returns incorrect DVD region info (rmi)
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Nov 28 01:40:03 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     James E. Flemer
>Release:        FreeBSD 6.0-STABLE i386
>Organization:
n/a
>Environment:
System: FreeBSD null.speednaked.com 6.0-STABLE FreeBSD 6.0-STABLE #2: Thu Nov 24 11:50:28 MST 2005 jflemer at minus.speednaked.com:/usr/obj/usr/src/sys/NULL6 i386

>Description:
	The DVDIOCREADSTRUCTURE ioctl for acd (atapi-cd) returns an incorrect
	value for the rmi field (region management info) when the
	DVD_STRUCT_COPYRIGHT format is requested.  It actually returns the
	value for the cpst field instead.
>How-To-Repeat:
	Use the DVDIOCREADSTRUCTURE/DVD_STRUCT_COPYRIGHT ioctl on cd0 and
	compare it to acd0.  Or compare the ioctl on acd0 to:
	> camcontrol cmd -n acd -u 0 -v -c "ad 0 0 0 0 0 0 1 0 8 0 0" -i 8 "i2 i1 i1 i1 i1 i1 i1"
>Fix:

	Apply patch below.

--- atapi-cd_rmi.diff begins here ---
Index: sys/dev/ata/atapi-cd.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/ata/atapi-cd.c,v
retrieving revision 1.179.2.1
diff -u -b -u -r1.179.2.1 atapi-cd.c
--- sys/dev/ata/atapi-cd.c	25 Aug 2005 16:21:05 -0000	1.179.2.1
+++ sys/dev/ata/atapi-cd.c	27 Nov 2005 23:48:47 -0000
@@ -1505,7 +1505,7 @@
 
     case DVD_STRUCT_COPYRIGHT:
 	s->cpst = d->data[0];
-	s->rmi = d->data[0];
+	s->rmi = d->data[1];
 	break;
 
     case DVD_STRUCT_DISCKEY:
--- atapi-cd_rmi.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted: