socsvn commit: r289847 - soc2013/def/crashdump-head/sys/kern

[def at FreeBSD.org]

Author: def
Date: Mon Aug 17 22:32:35 2015
New Revision: 289847
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=289847

Log:
  Remove key as soon as it's not needed.

Modified:
  soc2013/def/crashdump-head/sys/kern/kern_shutdown.c

Modified: soc2013/def/crashdump-head/sys/kern/kern_shutdown.c
==============================================================================
--- soc2013/def/crashdump-head/sys/kern/kern_shutdown.c	Mon Aug 17 21:07:21 2015	(r289846)
+++ soc2013/def/crashdump-head/sys/kern/kern_shutdown.c	Mon Aug 17 22:32:35 2015	(r289847)
@@ -925,15 +925,13 @@
 		return (error);
 
 	bcopy(kds.kds_key, dumpcrypto.kdc_key, sizeof(dumpcrypto.kdc_key));
+	bzero(kds.kds_key, sizeof(kds.kds_key));
 	arc4rand(dumpcrypto.kdc_iv, sizeof(dumpcrypto.kdc_iv), 0);
 
 	kdksize = ((sizeof(*kdk) + kds.kds_encryptedkeylen +
 	    KERNELDUMP_BLOCK_SIZE - 1) / KERNELDUMP_BLOCK_SIZE) *
 	    KERNELDUMP_BLOCK_SIZE;
-	kdk = (struct kerneldumpkey *)malloc(kdksize, M_KDK, M_WAITOK);
-	if (kdk == NULL)
-		return (ENOMEM);
-
+	kdk = malloc(kdksize, M_KDK, M_WAITOK | M_ZERO);
 	kdk->kdk_size = kdksize;
 	kdk->kdk_algorithm = CRYPTO_AES_CBC;
 	kdk->kdk_keysize = KERNELDUMP_KEY_SIZE;