Module Name: src Committed By: christos Date: Thu Mar 20 20:42:08 UTC 2014
Modified Files: src/sys/rump/dev/lib/libugenhc: ugenhc.c src/sys/rump/librump/rumpkern: rump.c src/sys/rump/librump/rumpvfs: devnodes.c src/sys/rump/net/lib/libshmif: if_shmem.c src/sys/rump/net/lib/libvirtif: if_virt.c Log Message: kill sprintf To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/sys/rump/dev/lib/libugenhc/ugenhc.c cvs rdiff -u -r1.290 -r1.291 src/sys/rump/librump/rumpkern/rump.c cvs rdiff -u -r1.8 -r1.9 src/sys/rump/librump/rumpvfs/devnodes.c cvs rdiff -u -r1.59 -r1.60 src/sys/rump/net/lib/libshmif/if_shmem.c cvs rdiff -u -r1.45 -r1.46 src/sys/rump/net/lib/libvirtif/if_virt.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/rump/dev/lib/libugenhc/ugenhc.c diff -u src/sys/rump/dev/lib/libugenhc/ugenhc.c:1.17 src/sys/rump/dev/lib/libugenhc/ugenhc.c:1.18 --- src/sys/rump/dev/lib/libugenhc/ugenhc.c:1.17 Wed Mar 12 21:38:11 2014 +++ src/sys/rump/dev/lib/libugenhc/ugenhc.c Thu Mar 20 16:42:08 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: ugenhc.c,v 1.17 2014/03/13 01:38:11 pooka Exp $ */ +/* $NetBSD: ugenhc.c,v 1.18 2014/03/20 20:42:08 christos Exp $ */ /* * Copyright (c) 2009, 2010 Antti Kantee. All Rights Reserved. @@ -61,7 +61,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ugenhc.c,v 1.17 2014/03/13 01:38:11 pooka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ugenhc.c,v 1.18 2014/03/20 20:42:08 christos Exp $"); #include <sys/param.h> #include <sys/bus.h> @@ -120,11 +120,11 @@ struct rusb_xfer { #define UGENDEV_BASESTR "/dev/ugen" #define UGENDEV_BUFSIZE 32 static void -makeugendevstr(int devnum, int endpoint, char *buf) +makeugendevstr(int devnum, int endpoint, char *buf, size_t len) { CTASSERT(UGENDEV_BUFSIZE > sizeof(UGENDEV_BASESTR)+sizeof("0.00")+1); - sprintf(buf, "%s%d.%02d", UGENDEV_BASESTR, devnum, endpoint); + snprintf(buf, len, "%s%d.%02d", UGENDEV_BASESTR, devnum, endpoint); } /* @@ -596,7 +596,7 @@ rhscintr(void *arg) usbd_xfer_handle xfer; int fd, error; - makeugendevstr(sc->sc_devnum, 0, buf); + makeugendevstr(sc->sc_devnum, 0, buf, sizeof(buf)); for (;;) { /* @@ -969,7 +969,7 @@ ugenhc_open(struct usbd_pipe *pipe) oflags = O_RDWR; } - makeugendevstr(sc->sc_devnum, endpt, buf); + makeugendevstr(sc->sc_devnum, endpt, buf, sizeof(buf)); /* XXX: theoretically should convert oflags */ error = rumpuser_open(buf, oflags, &fd); if (error != 0) { @@ -1057,7 +1057,7 @@ ugenhc_probe(device_t parent, cfdata_t m { char buf[UGENDEV_BUFSIZE]; - makeugendevstr(match->cf_unit, 0, buf); + makeugendevstr(match->cf_unit, 0, buf, sizeof(buf)); if (rumpuser_getfileinfo(buf, NULL, NULL) != 0) return 0; Index: src/sys/rump/librump/rumpkern/rump.c diff -u src/sys/rump/librump/rumpkern/rump.c:1.290 src/sys/rump/librump/rumpkern/rump.c:1.291 --- src/sys/rump/librump/rumpkern/rump.c:1.290 Sat Mar 15 11:15:27 2014 +++ src/sys/rump/librump/rumpkern/rump.c Thu Mar 20 16:42:08 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: rump.c,v 1.290 2014/03/15 15:15:27 pooka Exp $ */ +/* $NetBSD: rump.c,v 1.291 2014/03/20 20:42:08 christos Exp $ */ /* * Copyright (c) 2007-2011 Antti Kantee. All Rights Reserved. @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rump.c,v 1.290 2014/03/15 15:15:27 pooka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rump.c,v 1.291 2014/03/20 20:42:08 christos Exp $"); #include <sys/systm.h> #define ELFSIZE ARCH_ELFSIZE @@ -512,7 +512,8 @@ rump_init(void) #undef CPFX #undef CPFXLEN } else { - sprintf(buf, "rumpns_sys_%s", syscallnames[i]); + snprintf(buf, sizeof(buf), "rumpns_sys_%s", + syscallnames[i]); } if ((sym = rumpuser_dl_globalsym(buf)) != NULL && sym != rump_sysent[i].sy_call) { Index: src/sys/rump/librump/rumpvfs/devnodes.c diff -u src/sys/rump/librump/rumpvfs/devnodes.c:1.8 src/sys/rump/librump/rumpvfs/devnodes.c:1.9 --- src/sys/rump/librump/rumpvfs/devnodes.c:1.8 Thu Mar 7 17:12:34 2013 +++ src/sys/rump/librump/rumpvfs/devnodes.c Thu Mar 20 16:42:08 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: devnodes.c,v 1.8 2013/03/07 22:12:34 pooka Exp $ */ +/* $NetBSD: devnodes.c,v 1.9 2014/03/20 20:42:08 christos Exp $ */ /* * Copyright (c) 2009 Antti Kantee. All Rights Reserved. @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: devnodes.c,v 1.8 2013/03/07 22:12:34 pooka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: devnodes.c,v 1.9 2014/03/20 20:42:08 christos Exp $"); #include <sys/param.h> #include <sys/device.h> @@ -110,8 +110,8 @@ doesitexist(const char *path, bool isblk } static void -makeonenode(char *buf, devmajor_t blk, devmajor_t chr, devminor_t dmin, - const char *base, int c1, int c2) +makeonenode(char *buf, size_t len, devmajor_t blk, devmajor_t chr, + devminor_t dmin, const char *base, int c1, int c2) { char cstr1[2] = {0,0}, cstr2[2] = {0,0}; register_t rv; @@ -129,7 +129,7 @@ makeonenode(char *buf, devmajor_t blk, d } /* block device */ - snprintf(buf, MAXPATHLEN, "/dev/%s%s%s", base, cstr1, cstr2); + snprintf(buf, len, "/dev/%s%s%s", base, cstr1, cstr2); if (blk != NODEVMAJOR) { switch (doesitexist(buf, true, blk, dmin)) { case DIFFERENT: @@ -146,7 +146,7 @@ makeonenode(char *buf, devmajor_t blk, d /* done */ break; } - sprintf(buf, "/dev/r%s%s%s", base, cstr1, cstr2); + snprintf(buf, len, "/dev/r%s%s%s", base, cstr1, cstr2); } switch (doesitexist(buf, true, chr, dmin)) { @@ -190,20 +190,20 @@ rump_vfs_builddevs(struct devsw_conv *dc } else { themin = 0; } - makeonenode(pnbuf, + makeonenode(pnbuf, MAXPATHLEN, dc->d_bmajor, dc->d_cmajor, themin, dc->d_name, -1, -1); break; case DEVNODE_VECTOR: for (v1 = 0; v1 < dc->d_vectdim[0]; v1++) { if (dc->d_vectdim[1] == 0) { - makeonenode(pnbuf, + makeonenode(pnbuf, MAXPATHLEN, dc->d_bmajor, dc->d_cmajor, v1, dc->d_name, v1, -1); } else { for (v2 = 0; v2 < dc->d_vectdim[1]; v2++) { - makeonenode(pnbuf, + makeonenode(pnbuf, MAXPATHLEN, dc->d_bmajor, dc->d_cmajor, v1 * dc->d_vectdim[1] + v2, dc->d_name, v1, v2); @@ -217,8 +217,8 @@ rump_vfs_builddevs(struct devsw_conv *dc * ok, so we cheat a bit since * symlink isn't supported on rumpfs ... */ - makeonenode(pnbuf, -1, dc->d_cmajor, 0, - dc->d_name, -1, -1); + makeonenode(pnbuf, MAXPATHLEN, + -1, dc->d_cmajor, 0, dc->d_name, -1, -1); } break; Index: src/sys/rump/net/lib/libshmif/if_shmem.c diff -u src/sys/rump/net/lib/libshmif/if_shmem.c:1.59 src/sys/rump/net/lib/libshmif/if_shmem.c:1.60 --- src/sys/rump/net/lib/libshmif/if_shmem.c:1.59 Wed Mar 12 21:42:59 2014 +++ src/sys/rump/net/lib/libshmif/if_shmem.c Thu Mar 20 16:42:08 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: if_shmem.c,v 1.59 2014/03/13 01:42:59 pooka Exp $ */ +/* $NetBSD: if_shmem.c,v 1.60 2014/03/20 20:42:08 christos Exp $ */ /* * Copyright (c) 2009, 2010 Antti Kantee. All Rights Reserved. @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_shmem.c,v 1.59 2014/03/13 01:42:59 pooka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_shmem.c,v 1.60 2014/03/20 20:42:08 christos Exp $"); #include <sys/param.h> #include <sys/atomic.h> @@ -170,7 +170,7 @@ allocif(int unit, struct shmif_sc **scp) ifp = &sc->sc_ec.ec_if; - sprintf(ifp->if_xname, "shmif%d", unit); + snprintf(ifp->if_xname, sizeof(ifp->if_xname), "shmif%d", unit); ifp->if_softc = sc; ifp->if_flags = IFF_BROADCAST | IFF_MULTICAST; ifp->if_init = shmif_init; Index: src/sys/rump/net/lib/libvirtif/if_virt.c diff -u src/sys/rump/net/lib/libvirtif/if_virt.c:1.45 src/sys/rump/net/lib/libvirtif/if_virt.c:1.46 --- src/sys/rump/net/lib/libvirtif/if_virt.c:1.45 Tue Mar 18 14:10:08 2014 +++ src/sys/rump/net/lib/libvirtif/if_virt.c Thu Mar 20 16:42:08 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: if_virt.c,v 1.45 2014/03/18 18:10:08 pooka Exp $ */ +/* $NetBSD: if_virt.c,v 1.46 2014/03/20 20:42:08 christos Exp $ */ /* * Copyright (c) 2008, 2013 Antti Kantee. All Rights Reserved. @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_virt.c,v 1.45 2014/03/18 18:10:08 pooka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_virt.c,v 1.46 2014/03/20 20:42:08 christos Exp $"); #include <sys/param.h> #include <sys/kernel.h> @@ -109,7 +109,7 @@ virtif_clone(struct if_clone *ifc, int n sc = kmem_zalloc(sizeof(*sc), KM_SLEEP); sc->sc_num = num; ifp = &sc->sc_ec.ec_if; - sprintf(ifp->if_xname, "%s%d", VIF_NAME, num); + snprintf(ifp->if_xname, sizeof(ifp->if_xname), "%s%d", VIF_NAME, num); ifp->if_softc = sc; ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;