svn commit: r255663 - stable/9/sys/dev/usb/storage

[Hans Petter Selasky]

Author: hselasky
Date: Wed Sep 18 06:38:40 2013
New Revision: 255663
URL: http://svnweb.freebsd.org/changeset/base/255663

Log:
  MFC r255472:
  Clear correct data structure.

Modified:
  stable/9/sys/dev/usb/storage/umass.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/dev/   (props changed)

Modified: stable/9/sys/dev/usb/storage/umass.c
==============================================================================
--- stable/9/sys/dev/usb/storage/umass.c	Wed Sep 18 04:44:54 2013	(r255662)
+++ stable/9/sys/dev/usb/storage/umass.c	Wed Sep 18 06:38:40 2013	(r255663)
@@ -1320,10 +1320,12 @@ umass_t_bbb_command_callback(struct usb_
 			}
 			sc->cbw.bCDBLength = sc->sc_transfer.cmd_len;
 
+			/* copy SCSI command data */
 			memcpy(sc->cbw.CBWCDB, sc->sc_transfer.cmd_data,
 			    sc->sc_transfer.cmd_len);
 
-			memset(sc->sc_transfer.cmd_data +
+			/* clear remaining command area */
+			memset(sc->cbw.CBWCDB +
 			    sc->sc_transfer.cmd_len, 0,
 			    sizeof(sc->cbw.CBWCDB) -
 			    sc->sc_transfer.cmd_len);