Module Name: src
Committed By: joerg
Date: Tue Aug 5 17:55:20 UTC 2014
Modified Files:
src/sys/arch/sandpoint/stand/altboot: brdsetup.c dev_net.c dsk.c main.c
nif.c
Log Message:
Don't use non-literal strings as format strings.
XXX Switch to strlcpy.
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/sandpoint/stand/altboot/brdsetup.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/sandpoint/stand/altboot/dev_net.c
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/sandpoint/stand/altboot/dsk.c
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/sandpoint/stand/altboot/main.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/sandpoint/stand/altboot/nif.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/arch/sandpoint/stand/altboot/brdsetup.c
diff -u src/sys/arch/sandpoint/stand/altboot/brdsetup.c:1.33 src/sys/arch/sandpoint/stand/altboot/brdsetup.c:1.34
--- src/sys/arch/sandpoint/stand/altboot/brdsetup.c:1.33 Thu Nov 7 14:51:36 2013
+++ src/sys/arch/sandpoint/stand/altboot/brdsetup.c Tue Aug 5 17:55:20 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: brdsetup.c,v 1.33 2013/11/07 14:51:36 nisimura Exp $ */
+/* $NetBSD: brdsetup.c,v 1.34 2014/08/05 17:55:20 joerg Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -319,11 +319,11 @@ brdsetup(void)
brdfixup();
bi_mem.memsize = mpc107memsize();
- snprintf(bi_cons.devname, sizeof(bi_cons.devname), consname);
+ snprintf(bi_cons.devname, sizeof(bi_cons.devname), "%s", consname);
bi_cons.addr = consport;
bi_cons.speed = brdprop->consspeed;
bi_clk.ticks_per_sec = ticks_per_sec;
- snprintf(bi_fam.name, sizeof(bi_fam.name), brdprop->family);
+ snprintf(bi_fam.name, sizeof(bi_fam.name), "%s", brdprop->family);
}
struct brdprop *
Index: src/sys/arch/sandpoint/stand/altboot/dev_net.c
diff -u src/sys/arch/sandpoint/stand/altboot/dev_net.c:1.2 src/sys/arch/sandpoint/stand/altboot/dev_net.c:1.3
--- src/sys/arch/sandpoint/stand/altboot/dev_net.c:1.2 Sun Jul 17 20:54:46 2011
+++ src/sys/arch/sandpoint/stand/altboot/dev_net.c Tue Aug 5 17:55:20 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: dev_net.c,v 1.2 2011/07/17 20:54:46 joerg Exp $ */
+/* $NetBSD: dev_net.c,v 1.3 2014/08/05 17:55:20 joerg Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -75,7 +75,7 @@ net_open(struct open_file *f, ...)
}
if (file[0] != '\0')
- snprintf(bootfile, sizeof(bootfile), file);
+ snprintf(bootfile, sizeof(bootfile), "%s", file);
else if (bootfile[0] == '\0')
snprintf(bootfile, sizeof(bootfile), "netbsd");
@@ -83,7 +83,7 @@ net_open(struct open_file *f, ...)
&& (error = nfs_mount(netdev_sock, rootip, rootpath)) != 0)
goto bad;
- snprintf(bi_path.bootpath, sizeof(bi_path.bootpath), bootfile);
+ snprintf(bi_path.bootpath, sizeof(bi_path.bootpath), "%s", bootfile);
f->f_devdata = &netdev_sock;
netdev_opens++;
return 0;
Index: src/sys/arch/sandpoint/stand/altboot/dsk.c
diff -u src/sys/arch/sandpoint/stand/altboot/dsk.c:1.16 src/sys/arch/sandpoint/stand/altboot/dsk.c:1.17
--- src/sys/arch/sandpoint/stand/altboot/dsk.c:1.16 Thu Apr 26 19:59:37 2012
+++ src/sys/arch/sandpoint/stand/altboot/dsk.c Tue Aug 5 17:55:20 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: dsk.c,v 1.16 2012/04/26 19:59:37 phx Exp $ */
+/* $NetBSD: dsk.c,v 1.17 2014/08/05 17:55:20 joerg Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -502,7 +502,7 @@ dsk_open(struct open_file *f, ...)
d->part = part;
f->f_devdata = d;
- snprintf(bi_path.bootpath, sizeof(bi_path.bootpath), name);
+ snprintf(bi_path.bootpath, sizeof(bi_path.bootpath), "%s", name);
if (dlp->d_partitions[part].p_fstype == FS_BSDFFS) {
if ((error = ffsv2_open(name, f)) == 0) {
fs = &fs_ffsv2;
Index: src/sys/arch/sandpoint/stand/altboot/main.c
diff -u src/sys/arch/sandpoint/stand/altboot/main.c:1.25 src/sys/arch/sandpoint/stand/altboot/main.c:1.26
--- src/sys/arch/sandpoint/stand/altboot/main.c:1.25 Wed Mar 26 17:35:08 2014
+++ src/sys/arch/sandpoint/stand/altboot/main.c Tue Aug 5 17:55:20 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.25 2014/03/26 17:35:08 christos Exp $ */
+/* $NetBSD: main.c,v 1.26 2014/08/05 17:55:20 joerg Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -525,7 +525,7 @@ module_load(const char *kernel_path)
if (size < bm->bm_len)
printf("WARNING: couldn't load");
else {
- snprintf(bi->kmod, sizeof(bi->kmod), bm->bm_kmod);
+ snprintf(bi->kmod, sizeof(bi->kmod), "%s", bm->bm_kmod);
bi->type = BI_MODULE_ELF;
bi->len = size;
bi->base = kmodloadp;
Index: src/sys/arch/sandpoint/stand/altboot/nif.c
diff -u src/sys/arch/sandpoint/stand/altboot/nif.c:1.5 src/sys/arch/sandpoint/stand/altboot/nif.c:1.6
--- src/sys/arch/sandpoint/stand/altboot/nif.c:1.5 Sat Mar 12 16:41:23 2011
+++ src/sys/arch/sandpoint/stand/altboot/nif.c Tue Aug 5 17:55:20 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: nif.c,v 1.5 2011/03/12 16:41:23 phx Exp $ */
+/* $NetBSD: nif.c,v 1.6 2014/08/05 17:55:20 joerg Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -88,10 +88,10 @@ netif_init(void *self)
s->io_netif = dv;
memcpy(s->myea, enaddr, sizeof(s->myea));
/* build btinfo to identify NIF device */
- snprintf(bi_net.devname, sizeof(bi_net.devname), dv->name);
+ snprintf(bi_net.devname, sizeof(bi_net.devname), "%s", dv->name);
memcpy(bi_net.mac_address, enaddr, sizeof(bi_net.mac_address));
bi_net.cookie = tag;
- snprintf(bi_rdev.devname, sizeof(bi_rdev.devname), dv->name);
+ snprintf(bi_rdev.devname, sizeof(bi_rdev.devname), "%s", dv->name);
bi_rdev.cookie = tag;
return 1;
}
