Module Name: src
Committed By: christos
Date: Tue Mar 25 16:19:14 UTC 2014
Modified Files:
src/sys/dev: firmload.c
src/sys/dev/ata: ata_raid_intel.c ata_raid_jmicron.c ata_raid_nvidia.c
ata_raid_via.c
src/sys/dev/ic: ncr53c9xvar.h sunscpal.c
src/sys/dev/pci: if_kse.c if_wm.c
src/sys/dev/pci/cxgb: cxgb_l2t.c cxgb_offload.c
src/sys/dev/pci/hdaudio: hdafg.c
src/sys/dev/pci/ixgbe: ixv.c
src/sys/dev/pci/n8/common/api: n8_callback.c n8_daemon_sks.c n8_sks.c
n8_system.c
src/sys/dev/pci/n8/include_public: n8_pub_service.h n8_pub_sks.h
src/sys/dev/raidframe: rf_disks.c rf_general.h
Log Message:
kill sprintf
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/firmload.c
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/ata/ata_raid_intel.c \
src/sys/dev/ata/ata_raid_via.c
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/ata/ata_raid_jmicron.c
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/ata/ata_raid_nvidia.c
cvs rdiff -u -r1.55 -r1.56 src/sys/dev/ic/ncr53c9xvar.h
cvs rdiff -u -r1.25 -r1.26 src/sys/dev/ic/sunscpal.c
cvs rdiff -u -r1.25 -r1.26 src/sys/dev/pci/if_kse.c
cvs rdiff -u -r1.266 -r1.267 src/sys/dev/pci/if_wm.c
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/pci/cxgb/cxgb_l2t.c \
src/sys/dev/pci/cxgb/cxgb_offload.c
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/pci/hdaudio/hdafg.c
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/pci/ixgbe/ixv.c
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/pci/n8/common/api/n8_callback.c \
src/sys/dev/pci/n8/common/api/n8_daemon_sks.c \
src/sys/dev/pci/n8/common/api/n8_system.c
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/pci/n8/common/api/n8_sks.c
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/pci/n8/include_public/n8_pub_service.h \
src/sys/dev/pci/n8/include_public/n8_pub_sks.h
cvs rdiff -u -r1.84 -r1.85 src/sys/dev/raidframe/rf_disks.c
cvs rdiff -u -r1.20 -r1.21 src/sys/dev/raidframe/rf_general.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/firmload.c
diff -u src/sys/dev/firmload.c:1.18 src/sys/dev/firmload.c:1.19
--- src/sys/dev/firmload.c:1.18 Tue Feb 25 13:30:09 2014
+++ src/sys/dev/firmload.c Tue Mar 25 12:19:13 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: firmload.c,v 1.18 2014/02/25 18:30:09 pooka Exp $ */
+/* $NetBSD: firmload.c,v 1.19 2014/03/25 16:19:13 christos Exp $ */
/*-
* Copyright (c) 2005, 2006 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: firmload.c,v 1.18 2014/02/25 18:30:09 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: firmload.c,v 1.19 2014/03/25 16:19:13 christos Exp $");
/*
* The firmload API provides an interface for device drivers to access
@@ -185,11 +185,8 @@ firmware_path_next(const char *drvname,
prefix++;
*prefixp = prefix;
- /*
- * This sprintf() is safe because of the maxprefix calculation
- * performed above.
- */
- sprintf(&pnbuf[i], "/%s/%s", drvname, imgname);
+ KASSERT(MAXPATHLEN >= i);
+ snprintf(pnbuf + i, MAXPATHLEN - i, "/%s/%s", drvname, imgname);
return (pnbuf);
}
Index: src/sys/dev/ata/ata_raid_intel.c
diff -u src/sys/dev/ata/ata_raid_intel.c:1.6 src/sys/dev/ata/ata_raid_intel.c:1.7
--- src/sys/dev/ata/ata_raid_intel.c:1.6 Tue Jul 6 14:09:04 2010
+++ src/sys/dev/ata/ata_raid_intel.c Tue Mar 25 12:19:13 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ata_raid_intel.c,v 1.6 2010/07/06 18:09:04 bsh Exp $ */
+/* $NetBSD: ata_raid_intel.c,v 1.7 2014/03/25 16:19:13 christos Exp $ */
/*-
* Copyright (c) 2000-2008 Søren Schmidt <s...@freebsd.org>
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ata_raid_intel.c,v 1.6 2010/07/06 18:09:04 bsh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ata_raid_intel.c,v 1.7 2014/03/25 16:19:13 christos Exp $");
#include <sys/param.h>
#include <sys/buf.h>
@@ -79,7 +79,7 @@ ata_raid_intel_type(int type)
case INTEL_T_RAID5:
return "RAID5";
default:
- sprintf(buffer, "UNKNOWN 0x%02x", type);
+ snprintf(buffer, sizeof(buffer), "UNKNOWN 0x%02x", type);
return buffer;
}
}
Index: src/sys/dev/ata/ata_raid_via.c
diff -u src/sys/dev/ata/ata_raid_via.c:1.6 src/sys/dev/ata/ata_raid_via.c:1.7
--- src/sys/dev/ata/ata_raid_via.c:1.6 Fri Sep 19 12:49:27 2008
+++ src/sys/dev/ata/ata_raid_via.c Tue Mar 25 12:19:13 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ata_raid_via.c,v 1.6 2008/09/19 16:49:27 christos Exp $ */
+/* $NetBSD: ata_raid_via.c,v 1.7 2014/03/25 16:19:13 christos Exp $ */
/*-
* Copyright (c) 2000,2001,2002 Søren Schmidt <s...@freebsd.org>
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ata_raid_via.c,v 1.6 2008/09/19 16:49:27 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ata_raid_via.c,v 1.7 2014/03/25 16:19:13 christos Exp $");
#include <sys/param.h>
#include <sys/buf.h>
@@ -71,13 +71,13 @@ ata_raid_via_type(int type)
static char buffer[16];
switch (type) {
- case VIA_T_RAID0: return "RAID0";
- case VIA_T_RAID1: return "RAID1";
- case VIA_T_RAID5: return "RAID5";
- case VIA_T_RAID01: return "RAID0+1";
- case VIA_T_SPAN: return "SPAN";
- default:
- sprintf(buffer, "UNKNOWN 0x%02x", type);
+ case VIA_T_RAID0: return "RAID0";
+ case VIA_T_RAID1: return "RAID1";
+ case VIA_T_RAID5: return "RAID5";
+ case VIA_T_RAID01: return "RAID0+1";
+ case VIA_T_SPAN: return "SPAN";
+ default:
+ snprintf(buffer, sizeof(buffer), "UNKNOWN 0x%02x", type);
return buffer;
}
}
Index: src/sys/dev/ata/ata_raid_jmicron.c
diff -u src/sys/dev/ata/ata_raid_jmicron.c:1.4 src/sys/dev/ata/ata_raid_jmicron.c:1.5
--- src/sys/dev/ata/ata_raid_jmicron.c:1.4 Mon May 11 13:14:31 2009
+++ src/sys/dev/ata/ata_raid_jmicron.c Tue Mar 25 12:19:13 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ata_raid_jmicron.c,v 1.4 2009/05/11 17:14:31 cegger Exp $ */
+/* $NetBSD: ata_raid_jmicron.c,v 1.5 2014/03/25 16:19:13 christos Exp $ */
/*-
* Copyright (c) 2000-2008 Søren Schmidt <s...@freebsd.org>
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ata_raid_jmicron.c,v 1.4 2009/05/11 17:14:31 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ata_raid_jmicron.c,v 1.5 2014/03/25 16:19:13 christos Exp $");
#include <sys/param.h>
#include <sys/buf.h>
@@ -82,7 +82,7 @@ ata_raid_jmicron_type(int type)
case JM_T_JBOD:
return "JBOD";
default:
- sprintf(buffer, "UNKNOWN 0x%02x", type);
+ snprintf(buffer, sizeof(buffer), "UNKNOWN 0x%02x", type);
return buffer;
}
}
Index: src/sys/dev/ata/ata_raid_nvidia.c
diff -u src/sys/dev/ata/ata_raid_nvidia.c:1.1 src/sys/dev/ata/ata_raid_nvidia.c:1.2
--- src/sys/dev/ata/ata_raid_nvidia.c:1.1 Wed Aug 20 11:00:34 2008
+++ src/sys/dev/ata/ata_raid_nvidia.c Tue Mar 25 12:19:13 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ata_raid_nvidia.c,v 1.1 2008/08/20 15:00:34 tacha Exp $ */
+/* $NetBSD: ata_raid_nvidia.c,v 1.2 2014/03/25 16:19:13 christos Exp $ */
/*-
* Copyright (c) 2000 - 2008 Søren Schmidt <s...@freebsd.org>
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ata_raid_nvidia.c,v 1.1 2008/08/20 15:00:34 tacha Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ata_raid_nvidia.c,v 1.2 2014/03/25 16:19:13 christos Exp $");
#include <sys/param.h>
#include <sys/buf.h>
@@ -76,7 +76,7 @@ ata_raid_nvidia_type(int type)
case NV_T_RAID5: return "RAID5";
case NV_T_RAID01: return "RAID0+1";
default:
- sprintf(buffer, "UNKNOWN 0x%02x", type);
+ snprintf(buffer, sizeof(buffer), "UNKNOWN 0x%02x", type);
return buffer;
}
}
Index: src/sys/dev/ic/ncr53c9xvar.h
diff -u src/sys/dev/ic/ncr53c9xvar.h:1.55 src/sys/dev/ic/ncr53c9xvar.h:1.56
--- src/sys/dev/ic/ncr53c9xvar.h:1.55 Sun Jul 31 14:39:00 2011
+++ src/sys/dev/ic/ncr53c9xvar.h Tue Mar 25 12:19:13 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ncr53c9xvar.h,v 1.55 2011/07/31 18:39:00 jakllsch Exp $ */
+/* $NetBSD: ncr53c9xvar.h,v 1.56 2014/03/25 16:19:13 christos Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -130,9 +130,10 @@ struct ncr53c9x_ecb {
#if NCR53C9X_DEBUG > 1
#define ECB_TRACE(ecb, msg, a, b) do { \
const char *f = "[" msg "]"; \
- int n = strlen((ecb)->trace); \
- if (n < (sizeof((ecb)->trace)-100)) \
- sprintf((ecb)->trace + n, f, a, b); \
+ size_t n = strlen((ecb)->trace); \
+ if (n >= (sizeof((ecb)->trace)-100)) \
+ break; \
+ snprintf((ecb)->trace + n, sizeof((ecb)->trace) - n, f, a, b); \
} while(0)
#else
#define ECB_TRACE(ecb, msg, a, b)
Index: src/sys/dev/ic/sunscpal.c
diff -u src/sys/dev/ic/sunscpal.c:1.25 src/sys/dev/ic/sunscpal.c:1.26
--- src/sys/dev/ic/sunscpal.c:1.25 Sun Nov 22 21:13:46 2009
+++ src/sys/dev/ic/sunscpal.c Tue Mar 25 12:19:13 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: sunscpal.c,v 1.25 2009/11/23 02:13:46 rmind Exp $ */
+/* $NetBSD: sunscpal.c,v 1.26 2014/03/25 16:19:13 christos Exp $ */
/*
* Copyright (c) 2001 Matthew Fredette
@@ -76,7 +76,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunscpal.c,v 1.25 2009/11/23 02:13:46 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunscpal.c,v 1.26 2014/03/25 16:19:13 christos Exp $");
#include "opt_ddb.h"
@@ -725,7 +725,6 @@ sunscpal_scsipi_request(struct scsipi_ch
void *arg)
{
struct scsipi_xfer *xs;
- struct scsipi_periph *periph;
struct sunscpal_softc *sc;
struct sunscpal_req *sr;
int s, i, flags;
@@ -735,7 +734,6 @@ sunscpal_scsipi_request(struct scsipi_ch
switch (req) {
case ADAPTER_REQ_RUN_XFER:
xs = arg;
- periph = xs->xs_periph;
flags = xs->xs_control;
if (flags & XS_CTL_DATA_UIO)
Index: src/sys/dev/pci/if_kse.c
diff -u src/sys/dev/pci/if_kse.c:1.25 src/sys/dev/pci/if_kse.c:1.26
--- src/sys/dev/pci/if_kse.c:1.25 Fri Nov 8 01:20:48 2013
+++ src/sys/dev/pci/if_kse.c Tue Mar 25 12:19:13 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if_kse.c,v 1.25 2013/11/08 06:20:48 nisimura Exp $ */
+/* $NetBSD: if_kse.c,v 1.26 2014/03/25 16:19:13 christos Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_kse.c,v 1.25 2013/11/08 06:20:48 nisimura Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_kse.c,v 1.26 2014/03/25 16:19:13 christos Exp $");
#include <sys/param.h>
@@ -530,7 +530,8 @@ kse_attach(device_t parent, device_t sel
int p = (sc->sc_chip == 0x8842) ? 3 : 1;
for (i = 0; i < p; i++) {
struct ksext *ee = &sc->sc_ext;
- sprintf(ee->evcntname[i], "%s.%d", device_xname(sc->sc_dev), i+1);
+ snprintf(ee->evcntname[i], sizeof(ee->evcntname[i]),
+ "%s.%d", device_xname(sc->sc_dev), i+1);
evcnt_attach_dynamic(&ee->pev[i][0], EVCNT_TYPE_MISC,
NULL, ee->evcntname[i], "RxLoPriotyByte");
evcnt_attach_dynamic(&ee->pev[i][1], EVCNT_TYPE_MISC,
Index: src/sys/dev/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.266 src/sys/dev/pci/if_wm.c:1.267
--- src/sys/dev/pci/if_wm.c:1.266 Tue Jan 7 08:14:39 2014
+++ src/sys/dev/pci/if_wm.c Tue Mar 25 12:19:13 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.266 2014/01/07 13:14:39 msaitoh Exp $ */
+/* $NetBSD: if_wm.c,v 1.267 2014/03/25 16:19:13 christos Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -76,7 +76,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.266 2014/01/07 13:14:39 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.267 2014/03/25 16:19:13 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -2094,7 +2094,8 @@ wm_attach(device_t parent, device_t self
NULL, xname, "txtsopain");
for (i = 0; i < WM_NTXSEGS; i++) {
- sprintf(wm_txseg_evcnt_names[i], "txseg%d", i);
+ snprintf(wm_txseg_evcnt_names[i],
+ sizeof(wm_txseg_evcnt_names[i]), "txseg%d", i);
evcnt_attach_dynamic(&sc->sc_ev_txseg[i], EVCNT_TYPE_MISC,
NULL, xname, wm_txseg_evcnt_names[i]);
}
Index: src/sys/dev/pci/cxgb/cxgb_l2t.c
diff -u src/sys/dev/pci/cxgb/cxgb_l2t.c:1.2 src/sys/dev/pci/cxgb/cxgb_l2t.c:1.3
--- src/sys/dev/pci/cxgb/cxgb_l2t.c:1.2 Wed Jan 23 18:31:26 2013
+++ src/sys/dev/pci/cxgb/cxgb_l2t.c Tue Mar 25 12:19:14 2014
@@ -28,7 +28,7 @@ POSSIBILITY OF SUCH DAMAGE.
***************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cxgb_l2t.c,v 1.2 2013/01/23 23:31:26 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cxgb_l2t.c,v 1.3 2014/03/25 16:19:14 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -635,7 +635,7 @@ l2t_seq_show(struct seq_file *seq, void
struct l2t_entry *e = v;
mtx_lock(&e->lock);
- sprintf(ip, "%u.%u.%u.%u", NIPQUAD(e->addr));
+ snprintf(ip, sizeof(ip), "%u.%u.%u.%u", NIPQUAD(e->addr));
seq_printf(seq, "%-5u %-15s %02x:%02x:%02x:%02x:%02x:%02x %4d"
" %3u %c %7u %4u %s\n",
e->idx, ip, e->dmac[0], e->dmac[1], e->dmac[2],
Index: src/sys/dev/pci/cxgb/cxgb_offload.c
diff -u src/sys/dev/pci/cxgb/cxgb_offload.c:1.2 src/sys/dev/pci/cxgb/cxgb_offload.c:1.3
--- src/sys/dev/pci/cxgb/cxgb_offload.c:1.2 Tue May 17 21:01:59 2011
+++ src/sys/dev/pci/cxgb/cxgb_offload.c Tue Mar 25 12:19:14 2014
@@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE.
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cxgb_offload.c,v 1.2 2011/05/18 01:01:59 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cxgb_offload.c,v 1.3 2014/03/25 16:19:14 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1565,7 +1565,7 @@ offload_info_read_proc(char *buf, char *
struct tid_info *t = &d->tid_maps;
int len;
- len = sprintf(buf, "TID range: 0..%d, in use: %u\n"
+ len = snprintf(buf, length, "TID range: 0..%d, in use: %u\n"
"STID range: %d..%d, in use: %u\n"
"ATID range: %d..%d, in use: %u\n"
"MSS: %u\n",
@@ -1605,20 +1605,25 @@ offload_devices_read_proc(char *buf, cha
struct toedev *dev;
struct net_device *ndev;
- len = sprintf(buf, "Device Interfaces\n");
+ len = snprintf(buf, length, "Device Interfaces\n");
mtx_lock(&cxgb_db_lock);
TAILQ_FOREACH(dev, &ofld_dev_list, ofld_entry) {
- len += sprintf(buf + len, "%-16s", dev->name);
+ if (len >= length)
+ break;
+ len += snprintf(buf + len, length - len, "%-16s", dev->name);
read_lock(&dev_base_lock);
for (ndev = dev_base; ndev; ndev = ndev->next) {
- if (TOEDEV(ndev) == dev)
- len += sprintf(buf + len, " %s", ndev->name);
+ if (TOEDEV(ndev) == dev) {
+ if (len >= length)
+ break;
+ len += snprintf(buf + len, length - len, " %s", ndev->name);
+ }
}
read_unlock(&dev_base_lock);
- len += sprintf(buf + len, "\n");
if (len >= length)
break;
+ len += snprintf(buf + len, length - len, "\n");
}
mtx_unlock(&cxgb_db_lock);
Index: src/sys/dev/pci/hdaudio/hdafg.c
diff -u src/sys/dev/pci/hdaudio/hdafg.c:1.18 src/sys/dev/pci/hdaudio/hdafg.c:1.19
--- src/sys/dev/pci/hdaudio/hdafg.c:1.18 Wed Oct 16 14:13:00 2013
+++ src/sys/dev/pci/hdaudio/hdafg.c Tue Mar 25 12:19:14 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: hdafg.c,v 1.18 2013/10/16 18:13:00 christos Exp $ */
+/* $NetBSD: hdafg.c,v 1.19 2014/03/25 16:19:14 christos Exp $ */
/*
* Copyright (c) 2009 Precedence Technologies Ltd <supp...@precedence.co.uk>
@@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hdafg.c,v 1.18 2013/10/16 18:13:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hdafg.c,v 1.19 2014/03/25 16:19:14 christos Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -2944,7 +2944,8 @@ hdafg_build_mixers(struct hdafg_softc *s
if (sc->sc_assocs[i].as_dir != HDAUDIO_PINDIR_OUT)
continue;
mx[index].mx_di.un.s.member[j].mask = 1 << i;
- sprintf(mx[index].mx_di.un.s.member[j].label.name,
+ snprintf(mx[index].mx_di.un.s.member[j].label.name,
+ sizeof(mx[index].mx_di.un.s.member[j].label.name),
"%s%02X",
hdafg_assoc_type_string(&sc->sc_assocs[i]), i);
++j;
@@ -2967,7 +2968,8 @@ hdafg_build_mixers(struct hdafg_softc *s
if (sc->sc_assocs[i].as_dir != HDAUDIO_PINDIR_IN)
continue;
mx[index].mx_di.un.s.member[j].mask = 1 << i;
- sprintf(mx[index].mx_di.un.s.member[j].label.name,
+ snprintf(mx[index].mx_di.un.s.member[j].label.name,
+ sizeof(mx[index].mx_di.un.s.member[j].label.name),
"%s%02X",
hdafg_assoc_type_string(&sc->sc_assocs[i]), i);
++j;
Index: src/sys/dev/pci/ixgbe/ixv.c
diff -u src/sys/dev/pci/ixgbe/ixv.c:1.1 src/sys/dev/pci/ixgbe/ixv.c:1.2
--- src/sys/dev/pci/ixgbe/ixv.c:1.1 Fri Aug 12 17:55:29 2011
+++ src/sys/dev/pci/ixgbe/ixv.c Tue Mar 25 12:19:14 2014
@@ -31,7 +31,7 @@
******************************************************************************/
/*$FreeBSD: src/sys/dev/ixgbe/ixv.c,v 1.2 2011/03/23 13:10:15 jhb Exp $*/
-/*$NetBSD: ixv.c,v 1.1 2011/08/12 21:55:29 dyoung Exp $*/
+/*$NetBSD: ixv.c,v 1.2 2014/03/25 16:19:14 christos Exp $*/
#include "opt_inet.h"
@@ -269,9 +269,9 @@ ixv_probe(device_t dev)
((pci_subdevice_id == ent->subdevice_id) ||
(ent->subdevice_id == 0))) {
- sprintf(adapter_name, "%s, Version - %s",
- ixv_strings[ent->index],
- ixv_driver_version);
+ snprintf(adapter_name, sizeof(adapter_name),
+ "%s, Version - %s", ixv_strings[ent->index],
+ ixv_driver_version);
device_set_desc_copy(dev, adapter_name);
return (0);
}
Index: src/sys/dev/pci/n8/common/api/n8_callback.c
diff -u src/sys/dev/pci/n8/common/api/n8_callback.c:1.1 src/sys/dev/pci/n8/common/api/n8_callback.c:1.2
--- src/sys/dev/pci/n8/common/api/n8_callback.c:1.1 Thu Oct 30 08:02:14 2008
+++ src/sys/dev/pci/n8/common/api/n8_callback.c Tue Mar 25 12:19:14 2014
@@ -32,7 +32,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-static char const n8_id[] = "$Id: n8_callback.c,v 1.1 2008/10/30 12:02:14 darran Exp $";
+static char const n8_id[] = "$Id: n8_callback.c,v 1.2 2014/03/25 16:19:14 christos Exp $";
/*****************************************************************************/
/** @file n8_callback.c
* @brief Routines for implementing the API callbacks.
@@ -188,7 +188,7 @@ N8_Status_t n8_callbackThread(N8_Callbac
recalc_sigpending(current);
/* set name of this process (max 15 chars + 0 !) */
- sprintf(current->comm, "NSP2000 Thread");
+ strcpy(current->comm, "NSP2000 Thread");
#endif
while (callbackData_p->n8_thread == TRUE)
Index: src/sys/dev/pci/n8/common/api/n8_daemon_sks.c
diff -u src/sys/dev/pci/n8/common/api/n8_daemon_sks.c:1.1 src/sys/dev/pci/n8/common/api/n8_daemon_sks.c:1.2
--- src/sys/dev/pci/n8/common/api/n8_daemon_sks.c:1.1 Thu Oct 30 08:02:14 2008
+++ src/sys/dev/pci/n8/common/api/n8_daemon_sks.c Tue Mar 25 12:19:14 2014
@@ -32,7 +32,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-static char const n8_id[] = "$Id: n8_daemon_sks.c,v 1.1 2008/10/30 12:02:14 darran Exp $";
+static char const n8_id[] = "$Id: n8_daemon_sks.c,v 1.2 2014/03/25 16:19:14 christos Exp $";
/*****************************************************************************/
/** @file n8_daemon_sks.c
* @brief This file implements the user side of the daemon's SKS
@@ -233,8 +233,7 @@ N8_Status_t n8_daemon_sks_write(N8_SKSKe
* we don't terminate it with '/'. This is because on BSDi
* you can't create a directory whose name appended with '/'
*/
- sprintf(sub_dir, "%s%i",
- SKS_KEY_NODE_PATH,
+ snprintf(sub_dir, sizeof(sub_dir), "%s%i", SKS_KEY_NODE_PATH,
sks_key_p->unitID);
if ((dir_p = opendir(sub_dir)) == NULL)
@@ -258,7 +257,7 @@ N8_Status_t n8_daemon_sks_write(N8_SKSKe
}
/* build full path name for key handle file */
- sprintf(key_entry, "%s%i/%s",
+ snprintf(key_entry, sizeof(key_entry), "%s%i/%s",
SKS_KEY_NODE_PATH,
sks_key_p->unitID,
key_entry_name);
@@ -438,8 +437,8 @@ N8_Status_t n8_daemon_sks_init(N8_Unit_t
/* Open the SKS entry directory. Read all the key files and
* allocate descriptor space for them.
*/
- sprintf(sks_entry_name, "%s%i/", SKS_KEY_NODE_PATH,
- targetSKS);
+ snprintf(sks_entry_name, sizeof(sks_entry_name), "%s%i/",
+ SKS_KEY_NODE_PATH, targetSKS);
DBG(("Target sks dev node is '%s'.\n\n", sks_entry_name));
@@ -461,7 +460,7 @@ N8_Status_t n8_daemon_sks_init(N8_Unit_t
if ((strcmp(dirent_p->d_name, ".") != 0) &&
(strcmp(dirent_p->d_name, "..") != 0))
{
- sprintf(sks_entry, "%s%s", sks_entry_name,
+ snprintf(sks_entry, sizeof(sks_entry), "%s%s", sks_entry_name,
dirent_p->d_name);
ret = n8_daemon_sks_read(&keyHandle,
@@ -521,7 +520,8 @@ N8_Status_t n8_daemon_sks_reset(N8_Unit_
N8_Status_t ret = N8_STATUS_OK;
DBG(("Reset :\n"));
- sprintf(key_entry, "%s%i/", SKS_KEY_NODE_PATH, targetSKS);
+ snprintf(key_entry, sizeof(key_entry), "%s%i/",
+ SKS_KEY_NODE_PATH, targetSKS);
/* Find out which, if any, key entries exist. Then blast 'em. */
DBG(("Resetting SKS %i.\n", targetSKS));
@@ -557,7 +557,7 @@ N8_Status_t n8_daemon_sks_reset(N8_Unit_
}
DBG(("%s : \n", dirent_p->d_name));
- sprintf(key_entry_path, "%s%i/%s",
+ snprintf(key_entry_path, sizeof(key_entry_path), "%s%i/%s",
SKS_KEY_NODE_PATH,
targetSKS,
dirent_p->d_name);
Index: src/sys/dev/pci/n8/common/api/n8_system.c
diff -u src/sys/dev/pci/n8/common/api/n8_system.c:1.1 src/sys/dev/pci/n8/common/api/n8_system.c:1.2
--- src/sys/dev/pci/n8/common/api/n8_system.c:1.1 Thu Oct 30 08:02:15 2008
+++ src/sys/dev/pci/n8/common/api/n8_system.c Tue Mar 25 12:19:14 2014
@@ -32,7 +32,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-static char const n8_id[] = "$Id: n8_system.c,v 1.1 2008/10/30 12:02:15 darran Exp $";
+static char const n8_id[] = "$Id: n8_system.c,v 1.2 2014/03/25 16:19:14 christos Exp $";
/*****************************************************************************/
/** @file n8_system.c
* @brief Implements the API call N8_GetSystemParameter, which allows users to
@@ -71,7 +71,7 @@ static N8_Status_t setHWrevision(N8_Buff
static N8_Status_t setSWversion(N8_Buffer_t *value_p);
static N8_Status_t setContextSize(N8_Buffer_t *value_p);
static N8_Status_t setSKSsize(N8_Buffer_t *value_p);
-static N8_Status_t setSWversionText(N8_Buffer_t *value_p);
+static N8_Status_t setSWversionText(N8_Buffer_t *value_p, size_t value_l);
static N8_Status_t setFD(N8_Buffer_t *value_p);
static N8_Status_t setInitInfo(N8_Buffer_t *value_p);
@@ -104,7 +104,8 @@ extern NSPdriverInfo_t nspDriverInfo;
* @par Assumptions
* None<br>
*****************************************************************************/
-N8_Status_t N8_GetSystemParameter(N8_Parameter_t parameter, void *value_p)
+N8_Status_t N8_GetSystemParameter(N8_Parameter_t parameter, void *value_p,
+ size_t value_l)
{
N8_Status_t ret = N8_STATUS_OK;
@@ -156,7 +157,7 @@ N8_Status_t N8_GetSystemParameter(N8_Par
ret = setNumberOfChips(value_p);
break;
case N8_SWVERSIONTEXT:
- ret = setSWversionText(value_p);
+ ret = setSWversionText(value_p, value_l);
break;
case N8_INITIALIZE_INFO:
ret = setInitInfo(value_p);
@@ -685,9 +686,9 @@ static N8_Status_t setNumberOfChips(N8_B
* @par Assumptions
* None<br>
*****************************************************************************/
-N8_Status_t setSWversionText(N8_Buffer_t *value_p)
+N8_Status_t setSWversionText(N8_Buffer_t *value_p, size_t value_l)
{
- sprintf(value_p, N8_VERSION_STRING);
+ snprintf(value_p, value_l, N8_VERSION_STRING);
return N8_STATUS_OK;
} /* setSWversionText */
Index: src/sys/dev/pci/n8/common/api/n8_sks.c
diff -u src/sys/dev/pci/n8/common/api/n8_sks.c:1.2 src/sys/dev/pci/n8/common/api/n8_sks.c:1.3
--- src/sys/dev/pci/n8/common/api/n8_sks.c:1.2 Mon Aug 1 08:28:54 2011
+++ src/sys/dev/pci/n8/common/api/n8_sks.c Tue Mar 25 12:19:14 2014
@@ -32,7 +32,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-static char const n8_id[] = "$Id: n8_sks.c,v 1.2 2011/08/01 12:28:54 mbalmer Exp $";
+static char const n8_id[] = "$Id: n8_sks.c,v 1.3 2014/03/25 16:19:14 christos Exp $";
/*****************************************************************************/
/** @file SKS_Management_Interface
* @brief Implementation for the SKS Management Interface.
@@ -379,7 +379,7 @@ void n8_printSKSKeyHandle(const N8_SKSKe
* The given key handle pointer is valid.
*****************************************************************************/
N8_Status_t N8_SKSDisplay(N8_SKSKeyHandle_t *keyHandle_p,
- char *display_string_p)
+ char *display_string_p, size_t len)
{
if (keyHandle_p == NULL)
{
@@ -391,7 +391,7 @@ N8_Status_t N8_SKSDisplay(N8_SKSKeyHandl
return N8_INVALID_PARAMETER;
}
- sprintf(display_string_p,
+ snprintf(display_string_p, len,
"Key Handle:\n"
"\tKey Type %08x\n"
"\tKey Length %08x\n"
Index: src/sys/dev/pci/n8/include_public/n8_pub_service.h
diff -u src/sys/dev/pci/n8/include_public/n8_pub_service.h:1.1 src/sys/dev/pci/n8/include_public/n8_pub_service.h:1.2
--- src/sys/dev/pci/n8/include_public/n8_pub_service.h:1.1 Thu Oct 30 08:02:15 2008
+++ src/sys/dev/pci/n8/include_public/n8_pub_service.h Tue Mar 25 12:19:14 2014
@@ -134,7 +134,7 @@ typedef enum
/*****************************************************************************
* Function prototypes
*****************************************************************************/
-N8_Status_t N8_GetSystemParameter(N8_Parameter_t parameter, void *value_p);
+N8_Status_t N8_GetSystemParameter(N8_Parameter_t parameter, void *value_p, size_t value_l);
N8_Status_t N8_InitializeAPI(N8_ConfigAPI_t *parameters_p);
N8_Status_t N8_EventCheck(N8_Event_t *events_p, const int count, int *ready_p);
N8_Status_t N8_EventWait (N8_Event_t *events_p, const int count, int *ready_p);
Index: src/sys/dev/pci/n8/include_public/n8_pub_sks.h
diff -u src/sys/dev/pci/n8/include_public/n8_pub_sks.h:1.1 src/sys/dev/pci/n8/include_public/n8_pub_sks.h:1.2
--- src/sys/dev/pci/n8/include_public/n8_pub_sks.h:1.1 Thu Oct 30 08:02:15 2008
+++ src/sys/dev/pci/n8/include_public/n8_pub_sks.h Tue Mar 25 12:19:14 2014
@@ -76,7 +76,7 @@ N8_Status_t N8_SKSGetKeyHandle(const N8_
N8_SKSKeyHandle_t* keyHandle_p);
N8_Status_t N8_SKSDisplay(N8_SKSKeyHandle_t* keyHandle,
- char string[1024]);
+ char *string, size_t stringlength);
#ifdef __cplusplus
}
Index: src/sys/dev/raidframe/rf_disks.c
diff -u src/sys/dev/raidframe/rf_disks.c:1.84 src/sys/dev/raidframe/rf_disks.c:1.85
--- src/sys/dev/raidframe/rf_disks.c:1.84 Sun Sep 15 08:44:03 2013
+++ src/sys/dev/raidframe/rf_disks.c Tue Mar 25 12:19:14 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_disks.c,v 1.84 2013/09/15 12:44:03 martin Exp $ */
+/* $NetBSD: rf_disks.c,v 1.85 2014/03/25 16:19:14 christos Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -60,7 +60,7 @@
***************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_disks.c,v 1.84 2013/09/15 12:44:03 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_disks.c,v 1.85 2014/03/25 16:19:14 christos Exp $");
#include <dev/raidframe/raidframevar.h>
@@ -594,7 +594,8 @@ rf_ConfigureDisk(RF_Raid_t *raidPtr, cha
if (!strcmp("absent", diskPtr->devname)) {
printf("Ignoring missing component at column %d\n", col);
- sprintf(diskPtr->devname, "component%d", col);
+ snprintf(diskPtr->devname, sizeof(diskPtr->devname),
+ "component%d", col);
diskPtr->status = rf_ds_failed;
return (0);
}
Index: src/sys/dev/raidframe/rf_general.h
diff -u src/sys/dev/raidframe/rf_general.h:1.20 src/sys/dev/raidframe/rf_general.h:1.21
--- src/sys/dev/raidframe/rf_general.h:1.20 Sun Sep 15 08:06:50 2013
+++ src/sys/dev/raidframe/rf_general.h Tue Mar 25 12:19:14 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_general.h,v 1.20 2013/09/15 12:06:50 martin Exp $ */
+/* $NetBSD: rf_general.h,v 1.21 2014/03/25 16:19:14 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -41,7 +41,7 @@
/* error reporting and handling */
-#include <sys/systm.h> /* printf, sprintf, and friends */
+#include <sys/systm.h> /* printf, snprintf, and friends */
#define RF_ERRORMSG(s) printf((s))
#define RF_ERRORMSG1(s,a) printf((s),(a))
