svn commit: r257101 - stable/9/sbin/camcontrol

[Alexander Motin]

Author: mav
Date: Fri Oct 25 06:03:07 2013
New Revision: 257101
URL: http://svnweb.freebsd.org/changeset/base/257101

Log:
  MFC r256317:
  Fix mode page length calculation to remove last garbage line from the
  `camcontrol mode daX -l` output.

Modified:
  stable/9/sbin/camcontrol/modeedit.c
Directory Properties:
  stable/9/sbin/camcontrol/   (props changed)

Modified: stable/9/sbin/camcontrol/modeedit.c
==============================================================================
--- stable/9/sbin/camcontrol/modeedit.c	Fri Oct 25 05:33:04 2013	(r257100)
+++ stable/9/sbin/camcontrol/modeedit.c	Fri Oct 25 06:03:07 2013	(r257101)
@@ -886,12 +886,12 @@ mode_list(struct cam_device *device, int
 	    timeout, data, sizeof(data));
 
 	mh = (struct scsi_mode_header_6 *)data;
-	len = mh->blk_desc_len;		/* Skip block descriptors. */
+	len = sizeof(*mh) + mh->blk_desc_len;	/* Skip block descriptors. */
 	/* Iterate through the pages in the reply. */
 	while (len < mh->data_length) {
 		/* Locate the next mode page header. */
 		mph = (struct scsi_mode_page_header *)
-		    ((intptr_t)mh + sizeof(*mh) + len);
+		    ((intptr_t)mh + len);
 
 		mph->page_code &= SMS_PAGE_CODE;
 		nameentry = nameentry_lookup(mph->page_code);