summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhselasky <hselasky@FreeBSD.org>2013-09-11 10:18:36 +0000
committerhselasky <hselasky@FreeBSD.org>2013-09-11 10:18:36 +0000
commitaa68cbca5903957047a27c2717c554a984fe847d (patch)
tree8b350a6c74d9a1d4d37269d047bc61d21098b6b3
parent3b39d8bc1713816a989b1c9fd12c401f3a010087 (diff)
downloadFreeBSD-src-aa68cbca5903957047a27c2717c554a984fe847d.zip
FreeBSD-src-aa68cbca5903957047a27c2717c554a984fe847d.tar.gz
Clear correct data structure.
MFC after: 1 week Approved by: re (hrs)
-rw-r--r--sys/dev/usb/storage/umass.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/dev/usb/storage/umass.c b/sys/dev/usb/storage/umass.c
index e2ff0ef..2e6051d 100644
--- a/sys/dev/usb/storage/umass.c
+++ b/sys/dev/usb/storage/umass.c
@@ -1321,10 +1321,12 @@ umass_t_bbb_command_callback(struct usb_xfer *xfer, usb_error_t error)
}
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);
OpenPOWER on IntegriCloud