From owner-svn-soc-all@freebsd.org Mon Aug 17 22:32:37 2015 Return-Path: Delivered-To: svn-soc-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 001CC9BC134 for ; Mon, 17 Aug 2015 22:32:36 +0000 (UTC) (envelope-from def@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E502316F6 for ; Mon, 17 Aug 2015 22:32:36 +0000 (UTC) (envelope-from def@FreeBSD.org) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.15.2/8.15.2) with ESMTP id t7HMWaUj061770 for ; Mon, 17 Aug 2015 22:32:36 GMT (envelope-from def@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id t7HMWa7M061766 for svn-soc-all@FreeBSD.org; Mon, 17 Aug 2015 22:32:36 GMT (envelope-from def@FreeBSD.org) Date: Mon, 17 Aug 2015 22:32:36 GMT Message-Id: <201508172232.t7HMWa7M061766@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to def@FreeBSD.org using -f From: def@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r289847 - soc2013/def/crashdump-head/sys/kern MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 Aug 2015 22:32:37 -0000 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;