diff options
| author | alfred <alfred@FreeBSD.org> | 2012-11-02 18:57:38 +0000 |
|---|---|---|
| committer | alfred <alfred@FreeBSD.org> | 2012-11-02 18:57:38 +0000 |
| commit | 8c8997ccb993b99bfefb8e1b93dd24c7c11b317a (patch) | |
| tree | a4d3da30063eb3375f3f99591c67593684ed8aca /sys/kern/kern_shutdown.c | |
| parent | 2b3e07730c7fbe1fc0eef9829d873984eb90ffa9 (diff) | |
| download | FreeBSD-src-8c8997ccb993b99bfefb8e1b93dd24c7c11b317a.zip FreeBSD-src-8c8997ccb993b99bfefb8e1b93dd24c7c11b317a.tar.gz | |
Merge 242488, better use of strlcpy.
Submitted by: Eric van Gyzen <eric@vangyzen.net>
Diffstat (limited to 'sys/kern/kern_shutdown.c')
| -rw-r--r-- | sys/kern/kern_shutdown.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/kern/kern_shutdown.c b/sys/kern/kern_shutdown.c index d6c8b2d..788250a 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); } |
