aboutsummaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorAlfred Perlstein <alfred@FreeBSD.org>2012-11-02 18:57:38 +0000
committerAlfred Perlstein <alfred@FreeBSD.org>2012-11-02 18:57:38 +0000
commit5a3a8ec037c9f822703fa1dca42fec808ed37a76 (patch)
treea4d3da30063eb3375f3f99591c67593684ed8aca /sys
parent4a790edd1bae4d07dbd76dc5217069cadddaaec6 (diff)
Notes
Diffstat (limited to 'sys')
-rw-r--r--sys/kern/kern_shutdown.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/kern/kern_shutdown.c b/sys/kern/kern_shutdown.c
index d6c8b2d4039d..788250a0431a 100644
--- a/sys/kern/kern_shutdown.c
+++ b/sys/kern/kern_shutdown.c
@@ -720,6 +720,7 @@ SYSCTL_STRING(_kern_shutdown, OID_AUTO, dumpdevname, CTLFLAG_RD,
int
set_dumper(struct dumperinfo *di, const char *devname)
{
+ size_t wantcopy;
if (di == NULL) {
bzero(&dumper, sizeof dumper);
@@ -729,8 +730,8 @@ set_dumper(struct dumperinfo *di, const char *devname)
if (dumper.dumper != NULL)
return (EBUSY);
dumper = *di;
- strlcpy(dumpdevname, devname, sizeof(dumpdevname));
- if (strlen(dumpdevname) != strlen(devname)) {
+ wantcopy = strlcpy(dumpdevname, devname, sizeof(dumpdevname));
+ if (wantcopy >= sizeof(dumpdevname)) {
printf("set_dumper: device name truncated from '%s' -> '%s'\n",
devname, dumpdevname);
}