socsvn commit: r289492 - soc2013/def/crashdump-head/sys/ddb

[def at FreeBSD.org]

Author: def
Date: Sun Aug  9 23:07:11 2015
New Revision: 289492
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=289492

Log:
  Disable EKCD in textdumps.

Modified:
  soc2013/def/crashdump-head/sys/ddb/db_textdump.c

Modified: soc2013/def/crashdump-head/sys/ddb/db_textdump.c
==============================================================================
--- soc2013/def/crashdump-head/sys/ddb/db_textdump.c	Sun Aug  9 23:02:33 2015	(r289491)
+++ soc2013/def/crashdump-head/sys/ddb/db_textdump.c	Sun Aug  9 23:07:11 2015	(r289492)
@@ -427,6 +427,7 @@
 void
 textdump_dumpsys(struct dumperinfo *di)
 {
+	struct kerneldumpkey *kdk;
 	off_t dumplen, trailer_offset;
 
 	if (di->blocksize != TEXTDUMP_BLOCKSIZE) {
@@ -449,6 +450,12 @@
 	textdump_error = 0;
 
 	/*
+	 * Disable EKCD because we don't provide encrypted textdumps.
+	 */
+	kdk = di->kdk;
+	di->kdk = NULL;
+
+	/*
 	 * Position the start of the dump so that we'll write the kernel dump
 	 * trailer immediately before the end of the partition, and then work
 	 * our way back.  We will rewrite this header later to reflect the
@@ -500,6 +507,11 @@
 	else
 		printf("Textdump complete.\n");
 	textdump_pending = 0;
+
+	/*
+	 * Restore EKCD status.
+	 */
+	di->kdk = kdk;
 }
 
 /*-