Module Name: src
Committed By: martin
Date: Wed Feb 19 18:08:03 UTC 2020
Modified Files:
src/usr.sbin/sysinst: disklabel.c disks.c main.c target.c
Log Message:
Use strlcpy in a few places to guarnatee 0-terminated strings
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/usr.sbin/sysinst/disklabel.c
cvs rdiff -u -r1.65 -r1.66 src/usr.sbin/sysinst/disks.c
cvs rdiff -u -r1.20 -r1.21 src/usr.sbin/sysinst/main.c
cvs rdiff -u -r1.12 -r1.13 src/usr.sbin/sysinst/target.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/sysinst/disklabel.c
diff -u src/usr.sbin/sysinst/disklabel.c:1.35 src/usr.sbin/sysinst/disklabel.c:1.36
--- src/usr.sbin/sysinst/disklabel.c:1.35 Thu Feb 6 11:46:35 2020
+++ src/usr.sbin/sysinst/disklabel.c Wed Feb 19 18:08:03 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: disklabel.c,v 1.35 2020/02/06 11:46:35 martin Exp $ */
+/* $NetBSD: disklabel.c,v 1.36 2020/02/19 18:08:03 martin Exp $ */
/*
* Copyright 2018 The NetBSD Foundation, Inc.
@@ -934,7 +934,7 @@ disklabel_set_disk_pack_name(struct disk
struct disklabel_disk_partitions *parts =
(struct disklabel_disk_partitions*)arg;
- strncpy(parts->l.d_packname, pack, sizeof(parts->l.d_packname));
+ strlcpy(parts->l.d_packname, pack, sizeof(parts->l.d_packname));
return true;
}
Index: src/usr.sbin/sysinst/disks.c
diff -u src/usr.sbin/sysinst/disks.c:1.65 src/usr.sbin/sysinst/disks.c:1.66
--- src/usr.sbin/sysinst/disks.c:1.65 Thu Feb 6 19:08:38 2020
+++ src/usr.sbin/sysinst/disks.c Wed Feb 19 18:08:03 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: disks.c,v 1.65 2020/02/06 19:08:38 martin Exp $ */
+/* $NetBSD: disks.c,v 1.66 2020/02/19 18:08:03 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -1347,7 +1347,7 @@ make_fstab(struct install_partition_desc
break;
case FS_SWAP:
if (swap_dev[0] == 0) {
- strncpy(swap_dev, dev, sizeof swap_dev);
+ strlcpy(swap_dev, dev, sizeof swap_dev);
dump_dev = ",dp";
} else {
dump_dev = "";
Index: src/usr.sbin/sysinst/main.c
diff -u src/usr.sbin/sysinst/main.c:1.20 src/usr.sbin/sysinst/main.c:1.21
--- src/usr.sbin/sysinst/main.c:1.20 Thu Jan 16 16:47:19 2020
+++ src/usr.sbin/sysinst/main.c Wed Feb 19 18:08:03 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.20 2020/01/16 16:47:19 martin Exp $ */
+/* $NetBSD: main.c,v 1.21 2020/02/19 18:08:03 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -193,7 +193,7 @@ main(int argc, char **argv)
break;
case 'r':
/* Release name other than compiled in release. */
- strncpy(rel, optarg, sizeof rel);
+ strlcpy(rel, optarg, sizeof rel);
break;
case 'f':
/* Definition file to read. */
Index: src/usr.sbin/sysinst/target.c
diff -u src/usr.sbin/sysinst/target.c:1.12 src/usr.sbin/sysinst/target.c:1.13
--- src/usr.sbin/sysinst/target.c:1.12 Thu Feb 6 15:08:04 2020
+++ src/usr.sbin/sysinst/target.c Wed Feb 19 18:08:03 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: target.c,v 1.12 2020/02/06 15:08:04 martin Exp $ */
+/* $NetBSD: target.c,v 1.13 2020/02/19 18:08:03 martin Exp $ */
/*
* Copyright 1997 Jonathan Stone
@@ -71,7 +71,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: target.c,v 1.12 2020/02/06 15:08:04 martin Exp $");
+__RCSID("$NetBSD: target.c,v 1.13 2020/02/19 18:08:03 martin Exp $");
#endif
/*
@@ -436,8 +436,8 @@ cp_within_target(const char *frompath, c
char realfrom[STRSIZE];
char realto[STRSIZE];
- strncpy(realfrom, target_expand(frompath), STRSIZE);
- strncpy(realto, target_expand(topath), STRSIZE);
+ strlcpy(realfrom, target_expand(frompath), sizeof realfrom);
+ strlcpy(realto, target_expand(topath), sizeof realto);
if (access(realfrom, R_OK) == -1 && optional)
return 0;
