Module Name: src Committed By: martin Date: Mon Aug 29 16:18:10 UTC 2022
Modified Files: src/sys/dev/scsipi [netbsd-9]: sd.c sdvar.h Log Message: Pull up following revision(s) (requested by mlelstv in ticket #1509): sys/dev/scsipi/sdvar.h: revision 1.40 sys/dev/scsipi/sd.c: revision 1.335 Don't fetch data beyond end of inquiry buffer, which, here, is not NUL-terminated. Reduce target buffer to needed size (product name + NUL terminator). To generate a diff of this commit: cvs rdiff -u -r1.327.4.2 -r1.327.4.3 src/sys/dev/scsipi/sd.c cvs rdiff -u -r1.39 -r1.39.4.1 src/sys/dev/scsipi/sdvar.h 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/sd.c diff -u src/sys/dev/scsipi/sd.c:1.327.4.2 src/sys/dev/scsipi/sd.c:1.327.4.3 --- src/sys/dev/scsipi/sd.c:1.327.4.2 Thu Feb 11 12:53:28 2021 +++ src/sys/dev/scsipi/sd.c Mon Aug 29 16:18:10 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: sd.c,v 1.327.4.2 2021/02/11 12:53:28 martin Exp $ */ +/* $NetBSD: sd.c,v 1.327.4.3 2022/08/29 16:18:10 martin Exp $ */ /*- * Copyright (c) 1998, 2003, 2004 The NetBSD Foundation, Inc. @@ -47,7 +47,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sd.c,v 1.327.4.2 2021/02/11 12:53:28 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sd.c,v 1.327.4.3 2022/08/29 16:18:10 martin Exp $"); #ifdef _KERNEL_OPT #include "opt_scsi.h" @@ -254,9 +254,8 @@ sdattach(device_t parent, device_t self, SC_DEBUG(periph, SCSIPI_DB2, ("sdattach: ")); sd->type = (sa->sa_inqbuf.type & SID_TYPE); - strncpy(sd->name, sa->sa_inqbuf.product, sizeof(sd->name)); - - strncpy(sd->typename, sa->sa_inqbuf.product, sizeof(sd->typename)); + memcpy(sd->name, sa->sa_inqbuf.product, uimin(16, sizeof(sd->name))); + memcpy(sd->typename, sa->sa_inqbuf.product, uimin(16, sizeof(sd->typename))); if (sd->type == T_SIMPLE_DIRECT) periph->periph_quirks |= PQUIRK_ONLYBIG | PQUIRK_NOBIGMODESENSE; Index: src/sys/dev/scsipi/sdvar.h diff -u src/sys/dev/scsipi/sdvar.h:1.39 src/sys/dev/scsipi/sdvar.h:1.39.4.1 --- src/sys/dev/scsipi/sdvar.h:1.39 Tue Mar 19 06:59:40 2019 +++ src/sys/dev/scsipi/sdvar.h Mon Aug 29 16:18:10 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: sdvar.h,v 1.39 2019/03/19 06:59:40 mlelstv Exp $ */ +/* $NetBSD: sdvar.h,v 1.39.4.1 2022/08/29 16:18:10 martin Exp $ */ /*- * Copyright (c) 1998, 2004 The NetBSD Foundation, Inc. @@ -88,7 +88,7 @@ struct sd_softc { callout_t sc_callout; u_int8_t type; char name[16]; /* product name, for default disklabel */ - char typename[128+4+1]; /* stored in disk info */ + char typename[16+1]; /* stored in disk info */ }; #define SDGP_RESULT_OK 0 /* parameters obtained */