Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/ic only copy the actual command length in ciss_scsi_...



details:   https://anonhg.NetBSD.org/src/rev/f3867380f9e1
branches:  trunk
changeset: 935955:f3867380f9e1
user:      jdolecek <jdolecek%NetBSD.org@localhost>
date:      Tue Jul 14 10:44:34 2020 +0000

description:
only copy the actual command length in ciss_scsi_cmd(), instead of always
copying CISS_MAX_CDB bytes

Fixes reading past buffer memory triggered e.g. on kernel dump, reported
by KASAN:
ASan: Unauthorized Access In ...: Addr ... [16 bytes, read, RedZonePartial]

also do not pre-zero the cdb before copying cmd to it, there is no need for it

diffstat:

 sys/dev/ic/ciss.c |  7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diffs (28 lines):

diff -r e2985344b8a4 -r f3867380f9e1 sys/dev/ic/ciss.c
--- a/sys/dev/ic/ciss.c Tue Jul 14 10:38:06 2020 +0000
+++ b/sys/dev/ic/ciss.c Tue Jul 14 10:44:34 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ciss.c,v 1.45 2020/07/14 10:38:06 jdolecek Exp $       */
+/*     $NetBSD: ciss.c,v 1.46 2020/07/14 10:44:34 jdolecek Exp $       */
 /*     $OpenBSD: ciss.c,v 1.68 2013/05/30 16:15:02 deraadt Exp $       */
 
 /*
@@ -19,7 +19,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ciss.c,v 1.45 2020/07/14 10:38:06 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ciss.c,v 1.46 2020/07/14 10:44:34 jdolecek Exp $");
 
 #include "bio.h"
 
@@ -1225,8 +1225,7 @@
                else if (xs->xs_control & XS_CTL_DATA_OUT)
                        cmd->flags |= CISS_CDB_OUT;
                cmd->tmo = htole16(xs->timeout < 1000? 1 : xs->timeout / 1000);
-               memset(&cmd->cdb[0], 0, sizeof(cmd->cdb));
-               memcpy(&cmd->cdb[0], xs->cmd, CISS_MAX_CDB);
+               memcpy(&cmd->cdb[0], xs->cmd, xs->cmdlen);
                CISS_DPRINTF(CISS_D_CMD, ("cmd=%02x %02x %02x %02x %02x %02x ",
                             cmd->cdb[0], cmd->cdb[1], cmd->cdb[2],
                             cmd->cdb[3], cmd->cdb[4], cmd->cdb[5]));



Home | Main Index | Thread Index | Old Index