summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authormlelstv <mlelstv@NetBSD.org>2022-08-28 10:26:37 +0000
committermlelstv <mlelstv@NetBSD.org>2022-08-28 10:26:37 +0000
commita2e80737ec2f21242a2bc84eabcb4628427ad660 (patch)
treefd4f59c11a866a22f68593b31d86ddc26fd62f77 /sys/dev
parent2333cdbc0af7d80bbfa53ebf9605de7415e0391e (diff)
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).
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/scsipi/sd.c9
-rw-r--r--sys/dev/scsipi/sdvar.h4
2 files changed, 6 insertions, 7 deletions
diff --git a/sys/dev/scsipi/sd.c b/sys/dev/scsipi/sd.c
index ae055eb0341..cb45f713b8c 100644
--- a/sys/dev/scsipi/sd.c
+++ b/sys/dev/scsipi/sd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sd.c,v 1.334 2022/03/28 12:39:46 riastradh Exp $ */
+/* $NetBSD: sd.c,v 1.335 2022/08/28 10:26:37 mlelstv 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.334 2022/03/28 12:39:46 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sd.c,v 1.335 2022/08/28 10:26:37 mlelstv Exp $");
#ifdef _KERNEL_OPT
#include "opt_scsi.h"
@@ -258,9 +258,8 @@ sdattach(device_t parent, device_t self, void *aux)
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;
diff --git a/sys/dev/scsipi/sdvar.h b/sys/dev/scsipi/sdvar.h
index 8a952008308..3b7128e4b36 100644
--- a/sys/dev/scsipi/sdvar.h
+++ b/sys/dev/scsipi/sdvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: sdvar.h,v 1.39 2019/03/19 06:59:40 mlelstv Exp $ */
+/* $NetBSD: sdvar.h,v 1.40 2022/08/28 10:26:37 mlelstv 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 */