svn commit: r321418 - stable/11/sys/kern

[Mark Johnston]

Author: markj
Date: Mon Jul 24 16:23:28 2017
New Revision: 321418
URL: https://svnweb.freebsd.org/changeset/base/321418

Log:
  MFC r320918, r321035:
  Have mkdumpheader() handle version string truncation.

Modified:
  stable/11/sys/kern/kern_shutdown.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/kern/kern_shutdown.c
==============================================================================
--- stable/11/sys/kern/kern_shutdown.c	Mon Jul 24 15:39:09 2017	(r321417)
+++ stable/11/sys/kern/kern_shutdown.c	Mon Jul 24 16:23:28 2017	(r321418)
@@ -914,6 +914,7 @@ void
 mkdumpheader(struct kerneldumpheader *kdh, char *magic, uint32_t archver,
     uint64_t dumplen, uint32_t blksz)
 {
+	size_t dstsize;
 
 	bzero(kdh, sizeof(*kdh));
 	strlcpy(kdh->magic, magic, sizeof(kdh->magic));
@@ -924,7 +925,9 @@ mkdumpheader(struct kerneldumpheader *kdh, char *magic
 	kdh->dumptime = htod64(time_second);
 	kdh->blocksize = htod32(blksz);
 	strlcpy(kdh->hostname, prison0.pr_hostname, sizeof(kdh->hostname));
-	strlcpy(kdh->versionstring, version, sizeof(kdh->versionstring));
+	dstsize = sizeof(kdh->versionstring);
+	if (strlcpy(kdh->versionstring, version, dstsize) >= dstsize)
+		kdh->versionstring[dstsize - 2] = '\n';
 	if (panicstr != NULL)
 		strlcpy(kdh->panicstring, panicstr, sizeof(kdh->panicstring));
 	kdh->parity = kerneldump_parity(kdh);