From owner-svn-soc-all@FreeBSD.ORG Sun Jun 7 17:12:21 2015 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 12DA6A55 for ; Sun, 7 Jun 2015 17:12:21 +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 00B081E23 for ; Sun, 7 Jun 2015 17:12:21 +0000 (UTC) (envelope-from def@FreeBSD.org) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.9/8.14.9) with ESMTP id t57HCKE0039841 for ; Sun, 7 Jun 2015 17:12:20 GMT (envelope-from def@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.9/8.14.9/Submit) id t57HCKho039838 for svn-soc-all@FreeBSD.org; Sun, 7 Jun 2015 17:12:20 GMT (envelope-from def@FreeBSD.org) Date: Sun, 7 Jun 2015 17:12:20 GMT Message-Id: <201506071712.t57HCKho039838@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: r286796 - 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: Sun, 07 Jun 2015 17:12:21 -0000 Author: def Date: Sun Jun 7 17:12:19 2015 New Revision: 286796 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=286796 Log: Add missing EKCD scope. 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 Sun Jun 7 16:23:14 2015 (r286795) +++ soc2013/def/crashdump-head/sys/kern/kern_shutdown.c Sun Jun 7 17:12:19 2015 (r286796) @@ -139,6 +139,7 @@ SYSCTL_INT(_kern_shutdown, OID_AUTO, show_busybufs, CTLFLAG_RW, &show_busybufs, 0, ""); +#ifdef EKCD MALLOC_DEFINE(M_KDK, "kerneldumpkey", "Kernel dump key structure"); static struct kerneldumpcrypto { @@ -154,7 +155,6 @@ static struct kerneldumpkey *dumpkey; -#ifdef EKCD static int kerneldump_sysctl_keymaterial(SYSCTL_HANDLER_ARGS); static int kerneldump_sysctl_encryptedkey(SYSCTL_HANDLER_ARGS); @@ -967,6 +967,8 @@ if (dumper.dumper != NULL) return (EBUSY); dumper = *di; + dumper.kdc = NULL; + dumper.kdk = NULL; #ifdef EKCD error = kerneldump_crypto_init(&dumper, &dumpcrypto, dumpkey); @@ -982,6 +984,7 @@ return (0); } +#ifdef EKCD /* Encrypt data and call dumper. */ static int dump_encrypted_write(struct dumperinfo *di, void *virtual, vm_offset_t physical, @@ -1032,6 +1035,7 @@ return (0); } +#endif static int dump_check_bounds(struct dumperinfo *di, off_t offset, size_t length) @@ -1084,8 +1088,10 @@ if (error != 0) return (error); +#ifdef EKCD if (di->kdc->kdc_enable == 1) di->kdc->kdc_offset = offset + sizeof(*kdh); +#endif return (0); } @@ -1105,8 +1111,10 @@ if (error != 0) return (error); +#ifdef EKCD if (di->kdc->kdc_enable == 1) di->kdc->kdc_offset = offset + kerneldumpkey_size(kdk); +#endif return (0); }