From cd67ac41aefb03261e5b15dc710a2af8ddca04f7 Mon Sep 17 00:00:00 2001 From: Matthew D Fleming Date: Thu, 10 Mar 2011 22:56:00 +0000 Subject: Use MAXPATHLEN rather than the size of an extern array when copying the kernel name. Also consistenly use strlcpy(). Suggested by: Warner Losh --- sys/amd64/amd64/machdep.c | 2 +- sys/ia64/ia64/machdep.c | 2 +- sys/powerpc/aim/machdep.c | 2 +- sys/sparc64/sparc64/machdep.c | 2 +- sys/sun4v/sun4v/machdep.c | 2 +- sys/sys/kernel.h | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c index d1f841694069..0bb552c5ccb0 100644 --- a/sys/amd64/amd64/machdep.c +++ b/sys/amd64/amd64/machdep.c @@ -1741,7 +1741,7 @@ hammer_time(u_int64_t modulep, u_int64_t physfree) env = getenv("kernelname"); if (env != NULL) - strlcpy(kernelname, env, sizeof(kernelname)); + strlcpy(kernelname, env, MAXPATHLEN); #ifdef XENHVM if (inw(0x10) == 0x49d2) { diff --git a/sys/ia64/ia64/machdep.c b/sys/ia64/ia64/machdep.c index 01a349735290..19fec2bb6116 100644 --- a/sys/ia64/ia64/machdep.c +++ b/sys/ia64/ia64/machdep.c @@ -792,7 +792,7 @@ ia64_init(void) p = getenv("kernelname"); if (p != NULL) { - strncpy(kernelname, p, sizeof(kernelname) - 1); + strlcpy(kernelname, p, MAXPATHLEN); freeenv(p); } diff --git a/sys/powerpc/aim/machdep.c b/sys/powerpc/aim/machdep.c index efcfaac0ebe0..2a4f1c6a70b8 100644 --- a/sys/powerpc/aim/machdep.c +++ b/sys/powerpc/aim/machdep.c @@ -540,7 +540,7 @@ powerpc_init(vm_offset_t startkernel, vm_offset_t endkernel, */ env = getenv("kernelname"); if (env != NULL) { - strlcpy(kernelname, env, sizeof(kernelname)); + strlcpy(kernelname, env, MAXPATHLEN); freeenv(env); } diff --git a/sys/sparc64/sparc64/machdep.c b/sys/sparc64/sparc64/machdep.c index 86e0af8a7372..263a5e39bcb9 100644 --- a/sys/sparc64/sparc64/machdep.c +++ b/sys/sparc64/sparc64/machdep.c @@ -532,7 +532,7 @@ sparc64_init(caddr_t mdp, u_long o1, u_long o2, u_long o3, ofw_vec_t *vec) init_param2(physmem); env = getenv("kernelname"); if (env != NULL) { - strlcpy(kernelname, env, sizeof(kernelname)); + strlcpy(kernelname, env, MAXPATHLEN); freeenv(env); } diff --git a/sys/sun4v/sun4v/machdep.c b/sys/sun4v/sun4v/machdep.c index 9475933ff764..8016667f8ec3 100644 --- a/sys/sun4v/sun4v/machdep.c +++ b/sys/sun4v/sun4v/machdep.c @@ -425,7 +425,7 @@ sparc64_init(caddr_t mdp, u_long o1, u_long o2, u_long o3, ofw_vec_t *vec) env = getenv("kernelname"); if (env != NULL) { - strlcpy(kernelname, env, sizeof(kernelname)); + strlcpy(kernelname, env, MAXPATHLEN); freeenv(env); } diff --git a/sys/sys/kernel.h b/sys/sys/kernel.h index 1a9cb5cd003d..eb00b0dddd07 100644 --- a/sys/sys/kernel.h +++ b/sys/sys/kernel.h @@ -55,7 +55,7 @@ /* Global variables for the kernel. */ /* 1.1 */ -extern char kernelname[MAXPATHLEN]; +extern char kernelname[/*MAXPATHLEN*/]; extern int tick; /* usec per tick (1000000 / hz) */ extern int hz; /* system clock's frequency */ -- cgit v1.2.3