Module Name: src
Committed By: martin
Date: Fri May 31 08:10:58 UTC 2019
Modified Files:
src/sys/dev/scsipi [netbsd-8]: scsipi_ioctl.c
Log Message:
Pull up following revision(s) (requested by mlelstv in ticket #1278):
sys/dev/scsipi/scsipi_ioctl.c: revision 1.72 (via patch)
use correct size when copying outgoing sense data.
To generate a diff of this commit:
cvs rdiff -u -r1.69 -r1.69.8.1 src/sys/dev/scsipi/scsipi_ioctl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/scsipi/scsipi_ioctl.c
diff -u src/sys/dev/scsipi/scsipi_ioctl.c:1.69 src/sys/dev/scsipi/scsipi_ioctl.c:1.69.8.1
--- src/sys/dev/scsipi/scsipi_ioctl.c:1.69 Sun Nov 20 15:37:19 2016
+++ src/sys/dev/scsipi/scsipi_ioctl.c Fri May 31 08:10:58 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: scsipi_ioctl.c,v 1.69 2016/11/20 15:37:19 mlelstv Exp $ */
+/* $NetBSD: scsipi_ioctl.c,v 1.69.8.1 2019/05/31 08:10:58 martin Exp $ */
/*-
* Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: scsipi_ioctl.c,v 1.69 2016/11/20 15:37:19 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scsipi_ioctl.c,v 1.69.8.1 2019/05/31 08:10:58 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_freebsd.h"
@@ -168,14 +168,16 @@ scsipi_user_done(struct scsipi_xfer *xs)
SC_DEBUG(periph, SCSIPI_DB3, ("have sense\n"));
screq->senselen_used = min(sizeof(xs->sense.scsi_sense),
SENSEBUFLEN);
- memcpy(screq->sense, &xs->sense.scsi_sense, screq->senselen);
+ memcpy(screq->sense, &xs->sense.scsi_sense,
+ screq->senselen_used);
screq->retsts = SCCMD_SENSE;
break;
case XS_SHORTSENSE:
SC_DEBUG(periph, SCSIPI_DB3, ("have short sense\n"));
screq->senselen_used = min(sizeof(xs->sense.atapi_sense),
SENSEBUFLEN);
- memcpy(screq->sense, &xs->sense.scsi_sense, screq->senselen);
+ memcpy(screq->sense, &xs->sense.atapi_sense,
+ screq->senselen_used);
screq->retsts = SCCMD_UNKNOWN; /* XXX need a shortsense here */
break;
case XS_DRIVER_STUFFUP:
