[Midnightbsd-cvs] src [8526] trunk/sys: dont pass provider name as a format string
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Mon Sep 19 09:42:09 EDT 2016
Revision: 8526
http://svnweb.midnightbsd.org/src/?rev=8526
Author: laffer1
Date: 2016-09-19 09:42:09 -0400 (Mon, 19 Sep 2016)
Log Message:
-----------
dont pass provider name as a format string
Modified Paths:
--------------
trunk/sys/dev/fdc/fdc.c
trunk/sys/geom/bde/g_bde.c
trunk/sys/geom/cache/g_cache.c
trunk/sys/geom/geom.h
trunk/sys/geom/geom_aes.c
trunk/sys/geom/geom_dev.c
trunk/sys/geom/geom_mbr.c
trunk/sys/geom/geom_slice.c
trunk/sys/geom/geom_slice.h
trunk/sys/geom/label/g_label.c
trunk/sys/geom/mountver/g_mountver.c
trunk/sys/geom/multipath/g_multipath.c
trunk/sys/geom/nop/g_nop.c
trunk/sys/geom/sched/g_sched.c
trunk/sys/vm/swap_pager.c
Modified: trunk/sys/dev/fdc/fdc.c
===================================================================
--- trunk/sys/dev/fdc/fdc.c 2016-09-19 13:35:34 UTC (rev 8525)
+++ trunk/sys/dev/fdc/fdc.c 2016-09-19 13:42:09 UTC (rev 8526)
@@ -865,7 +865,7 @@
g_orphan_provider(fd->fd_provider, ENXIO);
fd->fd_provider->flags |= G_PF_WITHER;
fd->fd_provider =
- g_new_providerf(fd->fd_geom, fd->fd_geom->name);
+ g_new_providerf(fd->fd_geom, "%s", fd->fd_geom->name);
g_error_provider(fd->fd_provider, 0);
g_topology_unlock();
return (fdc_biodone(fdc, ENXIO));
@@ -2011,7 +2011,7 @@
fd->fd_geom = g_new_geomf(&g_fd_class,
"fd%d", device_get_unit(fd->dev));
- fd->fd_provider = g_new_providerf(fd->fd_geom, fd->fd_geom->name);
+ fd->fd_provider = g_new_providerf(fd->fd_geom, "%s", fd->fd_geom->name);
fd->fd_geom->softc = fd;
g_error_provider(fd->fd_provider, 0);
}
Modified: trunk/sys/geom/bde/g_bde.c
===================================================================
--- trunk/sys/geom/bde/g_bde.c 2016-09-19 13:35:34 UTC (rev 8525)
+++ trunk/sys/geom/bde/g_bde.c 2016-09-19 13:42:09 UTC (rev 8526)
@@ -1,4 +1,4 @@
-/* $MidnightBSD: src/sys/geom/bde/g_bde.c,v 1.2 2008/12/03 00:25:46 laffer1 Exp $ */
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2002 Poul-Henning Kamp
* Copyright (c) 2002 Networks Associates Technology, Inc.
@@ -189,7 +189,7 @@
/* XXX: error check */
kproc_create(g_bde_worker, gp, &sc->thread, 0, 0,
"g_bde %s", gp->name);
- pp = g_new_providerf(gp, gp->name);
+ pp = g_new_providerf(gp, "%s", gp->name);
#if 0
/*
* XXX: Disable this for now. Appearantly UFS no longer
Modified: trunk/sys/geom/cache/g_cache.c
===================================================================
--- trunk/sys/geom/cache/g_cache.c 2016-09-19 13:35:34 UTC (rev 8525)
+++ trunk/sys/geom/cache/g_cache.c 2016-09-19 13:42:09 UTC (rev 8526)
@@ -1,4 +1,4 @@
-/* $MidnightBSD: src/sys/geom/cache/g_cache.c,v 1.2 2008/12/03 00:25:47 laffer1 Exp $ */
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2006 Ruslan Ermilov <ru at FreeBSD.org>
* All rights reserved.
@@ -502,7 +502,7 @@
return (NULL);
}
- gp = g_new_geomf(mp, md->md_name);
+ gp = g_new_geomf(mp, "%s", md->md_name);
sc = g_malloc(sizeof(*sc), M_WAITOK | M_ZERO);
sc->sc_type = type;
sc->sc_bshift = bshift;
Modified: trunk/sys/geom/geom.h
===================================================================
--- trunk/sys/geom/geom.h 2016-09-19 13:35:34 UTC (rev 8525)
+++ trunk/sys/geom/geom.h 2016-09-19 13:42:09 UTC (rev 8526)
@@ -263,8 +263,10 @@
int g_handleattr_off_t(struct bio *bp, const char *attribute, off_t val);
int g_handleattr_str(struct bio *bp, const char *attribute, const char *str);
struct g_consumer * g_new_consumer(struct g_geom *gp);
-struct g_geom * g_new_geomf(struct g_class *mp, const char *fmt, ...);
-struct g_provider * g_new_providerf(struct g_geom *gp, const char *fmt, ...);
+struct g_geom * g_new_geomf(struct g_class *mp, const char *fmt, ...)
+ __printflike(2, 3);
+struct g_provider * g_new_providerf(struct g_geom *gp, const char *fmt, ...)
+ __printflike(2, 3);
int g_retaste(struct g_class *mp);
void g_spoil(struct g_provider *pp, struct g_consumer *cp);
int g_std_access(struct g_provider *pp, int dr, int dw, int de);
Modified: trunk/sys/geom/geom_aes.c
===================================================================
--- trunk/sys/geom/geom_aes.c 2016-09-19 13:35:34 UTC (rev 8525)
+++ trunk/sys/geom/geom_aes.c 2016-09-19 13:42:09 UTC (rev 8526)
@@ -345,7 +345,7 @@
}
}
g_topology_lock();
- pp = g_new_providerf(gp, gp->name);
+ pp = g_new_providerf(gp, "%s", gp->name);
pp->mediasize = mediasize - sectorsize;
pp->sectorsize = sectorsize;
g_error_provider(pp, 0);
Modified: trunk/sys/geom/geom_dev.c
===================================================================
--- trunk/sys/geom/geom_dev.c 2016-09-19 13:35:34 UTC (rev 8525)
+++ trunk/sys/geom/geom_dev.c 2016-09-19 13:42:09 UTC (rev 8526)
@@ -1,4 +1,4 @@
-/* $MidnightBSD: src/sys/geom/geom_dev.c,v 1.7 2012/04/01 04:19:13 laffer1 Exp $ */
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2002 Poul-Henning Kamp
* Copyright (c) 2002 Networks Associates Technology, Inc.
@@ -165,7 +165,7 @@
LIST_FOREACH(cp, &pp->consumers, consumers)
if (cp->geom->class == mp)
return (NULL);
- gp = g_new_geomf(mp, pp->name);
+ gp = g_new_geomf(mp, "%s", pp->name);
cp = g_new_consumer(gp);
error = g_attach(cp, pp);
KASSERT(error == 0,
Modified: trunk/sys/geom/geom_mbr.c
===================================================================
--- trunk/sys/geom/geom_mbr.c 2016-09-19 13:35:34 UTC (rev 8525)
+++ trunk/sys/geom/geom_mbr.c 2016-09-19 13:42:09 UTC (rev 8526)
@@ -1,4 +1,4 @@
-/* $MidnightBSD: src/sys/geom/geom_mbr.c,v 1.3 2008/12/03 00:25:46 laffer1 Exp $ */
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2002 Poul-Henning Kamp
* Copyright (c) 2002 Networks Associates Technology, Inc.
@@ -484,8 +484,8 @@
((off_t)dp[0].dp_size) << 9ULL,
sectorsize,
"%*.*s%d",
- strlen(gp->name) - 1,
- strlen(gp->name) - 1,
+ (int)strlen(gp->name) - 1,
+ (int)strlen(gp->name) - 1,
gp->name,
slice + 5);
g_topology_unlock();
Modified: trunk/sys/geom/geom_slice.c
===================================================================
--- trunk/sys/geom/geom_slice.c 2016-09-19 13:35:34 UTC (rev 8525)
+++ trunk/sys/geom/geom_slice.c 2016-09-19 13:42:09 UTC (rev 8526)
@@ -1,4 +1,4 @@
-/* $MidnightBSD: src/sys/geom/geom_slice.c,v 1.5 2011/12/10 22:55:34 laffer1 Exp $ */
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2002 Poul-Henning Kamp
* Copyright (c) 2002 Networks Associates Technology, Inc.
@@ -391,7 +391,7 @@
sbuf_vprintf(sb, fmt, ap);
va_end(ap);
sbuf_finish(sb);
- pp = g_new_providerf(gp, sbuf_data(sb));
+ pp = g_new_providerf(gp, "%s", sbuf_data(sb));
pp2 = LIST_FIRST(&gp->consumer)->provider;
pp->flags = pp2->flags & G_PF_CANDELETE;
pp->stripesize = pp2->stripesize;
Modified: trunk/sys/geom/geom_slice.h
===================================================================
--- trunk/sys/geom/geom_slice.h 2016-09-19 13:35:34 UTC (rev 8525)
+++ trunk/sys/geom/geom_slice.h 2016-09-19 13:42:09 UTC (rev 8526)
@@ -70,7 +70,7 @@
};
g_dumpconf_t g_slice_dumpconf;
-int g_slice_config(struct g_geom *gp, u_int idx, int how, off_t offset, off_t length, u_int sectorsize, const char *fmt, ...);
+int g_slice_config(struct g_geom *gp, u_int idx, int how, off_t offset, off_t length, u_int sectorsize, const char *fmt, ...) __printflike(7, 8);
void g_slice_spoiled(struct g_consumer *cp);
void g_slice_orphan(struct g_consumer *cp);
#define G_SLICE_CONFIG_CHECK 0
Modified: trunk/sys/geom/label/g_label.c
===================================================================
--- trunk/sys/geom/label/g_label.c 2016-09-19 13:35:34 UTC (rev 8525)
+++ trunk/sys/geom/label/g_label.c 2016-09-19 13:42:09 UTC (rev 8526)
@@ -1,4 +1,4 @@
-/* $MidnightBSD: src/sys/geom/label/g_label.c,v 1.5 2011/12/10 15:46:15 laffer1 Exp $ */
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2004-2005 Pawel Jakub Dawidek <pjd at FreeBSD.org>
* All rights reserved.
@@ -188,7 +188,7 @@
gp->spoiled = g_label_spoiled;
g_access(cp, -1, 0, 0);
g_slice_config(gp, 0, G_SLICE_CONFIG_SET, (off_t)0, mediasize,
- pp->sectorsize, name);
+ pp->sectorsize, "%s", name);
G_LABEL_DEBUG(1, "Label for provider %s is %s.", pp->name, name);
return (gp);
}
Modified: trunk/sys/geom/mountver/g_mountver.c
===================================================================
--- trunk/sys/geom/mountver/g_mountver.c 2016-09-19 13:35:34 UTC (rev 8525)
+++ trunk/sys/geom/mountver/g_mountver.c 2016-09-19 13:42:09 UTC (rev 8526)
@@ -249,7 +249,7 @@
return (EEXIST);
}
}
- gp = g_new_geomf(mp, name);
+ gp = g_new_geomf(mp, "%s", name);
sc = g_malloc(sizeof(*sc), M_WAITOK | M_ZERO);
mtx_init(&sc->sc_mtx, "gmountver", NULL, MTX_DEF);
TAILQ_INIT(&sc->sc_queue);
@@ -260,7 +260,7 @@
gp->access = g_mountver_access;
gp->dumpconf = g_mountver_dumpconf;
- newpp = g_new_providerf(gp, gp->name);
+ newpp = g_new_providerf(gp, "%s", gp->name);
newpp->mediasize = pp->mediasize;
newpp->sectorsize = pp->sectorsize;
Modified: trunk/sys/geom/multipath/g_multipath.c
===================================================================
--- trunk/sys/geom/multipath/g_multipath.c 2016-09-19 13:35:34 UTC (rev 8525)
+++ trunk/sys/geom/multipath/g_multipath.c 2016-09-19 13:42:09 UTC (rev 8526)
@@ -430,7 +430,7 @@
}
}
- gp = g_new_geomf(mp, md->md_name);
+ gp = g_new_geomf(mp, "%s", md->md_name);
sc = g_malloc(sizeof(*sc), M_WAITOK | M_ZERO);
mtx_init(&sc->sc_mtx, "multipath", NULL, MTX_DEF);
memcpy(sc->sc_uuid, md->md_uuid, sizeof (sc->sc_uuid));
Modified: trunk/sys/geom/nop/g_nop.c
===================================================================
--- trunk/sys/geom/nop/g_nop.c 2016-09-19 13:35:34 UTC (rev 8525)
+++ trunk/sys/geom/nop/g_nop.c 2016-09-19 13:42:09 UTC (rev 8526)
@@ -1,4 +1,4 @@
-/* $MidnightBSD: src/sys/geom/nop/g_nop.c,v 1.3 2008/12/03 00:25:49 laffer1 Exp $ */
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2004-2006 Pawel Jakub Dawidek <pjd at FreeBSD.org>
* All rights reserved.
@@ -190,7 +190,7 @@
return (EEXIST);
}
}
- gp = g_new_geomf(mp, name);
+ gp = g_new_geomf(mp, "%s", name);
sc = g_malloc(sizeof(*sc), M_WAITOK);
sc->sc_offset = offset;
sc->sc_error = ioerror;
@@ -206,7 +206,7 @@
gp->access = g_nop_access;
gp->dumpconf = g_nop_dumpconf;
- newpp = g_new_providerf(gp, gp->name);
+ newpp = g_new_providerf(gp, "%s", gp->name);
newpp->mediasize = size;
newpp->sectorsize = secsize;
Modified: trunk/sys/geom/sched/g_sched.c
===================================================================
--- trunk/sys/geom/sched/g_sched.c 2016-09-19 13:35:34 UTC (rev 8525)
+++ trunk/sys/geom/sched/g_sched.c 2016-09-19 13:42:09 UTC (rev 8526)
@@ -1003,7 +1003,7 @@
}
}
- gp = g_new_geomf(mp, name);
+ gp = g_new_geomf(mp, "%s", name);
dstgp = proxy ? pp->geom : gp; /* where do we link the provider */
sc = g_malloc(sizeof(*sc), M_WAITOK | M_ZERO);
@@ -1029,7 +1029,7 @@
gp->access = g_sched_access;
gp->dumpconf = g_sched_dumpconf;
- newpp = g_new_providerf(dstgp, gp->name);
+ newpp = g_new_providerf(dstgp, "%s", gp->name);
newpp->mediasize = pp->mediasize;
newpp->sectorsize = pp->sectorsize;
Modified: trunk/sys/vm/swap_pager.c
===================================================================
--- trunk/sys/vm/swap_pager.c 2016-09-19 13:35:34 UTC (rev 8525)
+++ trunk/sys/vm/swap_pager.c 2016-09-19 13:42:09 UTC (rev 8526)
@@ -2612,7 +2612,7 @@
}
mtx_unlock(&sw_dev_mtx);
if (gp == NULL)
- gp = g_new_geomf(&g_swap_class, "swap", NULL);
+ gp = g_new_geomf(&g_swap_class, "swap");
cp = g_new_consumer(gp);
g_attach(cp, pp);
/*
More information about the Midnightbsd-cvs
mailing list