From owner-svn-src-user@freebsd.org Fri Mar 9 22:34:44 2018 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 55A82F2C245 for ; Fri, 9 Mar 2018 22:34:44 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 08F0A71536; Fri, 9 Mar 2018 22:34:44 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id F3C7A251D5; Fri, 9 Mar 2018 22:34:43 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w29MYhOf063588; Fri, 9 Mar 2018 22:34:43 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w29MYhgn063586; Fri, 9 Mar 2018 22:34:43 GMT (envelope-from markj@FreeBSD.org) Message-Id: <201803092234.w29MYhgn063586@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Fri, 9 Mar 2018 22:34:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r330706 - user/markj/netdump/sys/netinet/netdump X-SVN-Group: user X-SVN-Commit-Author: markj X-SVN-Commit-Paths: user/markj/netdump/sys/netinet/netdump X-SVN-Commit-Revision: 330706 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 Mar 2018 22:34:44 -0000 Author: markj Date: Fri Mar 9 22:34:43 2018 New Revision: 330706 URL: https://svnweb.freebsd.org/changeset/base/330706 Log: Add a new packet type for the symmetric key used in encrypted dumps. Modified: user/markj/netdump/sys/netinet/netdump/netdump.h user/markj/netdump/sys/netinet/netdump/netdump_client.c Modified: user/markj/netdump/sys/netinet/netdump/netdump.h ============================================================================== --- user/markj/netdump/sys/netinet/netdump/netdump.h Fri Mar 9 21:32:07 2018 (r330705) +++ user/markj/netdump/sys/netinet/netdump/netdump.h Fri Mar 9 22:34:43 2018 (r330706) @@ -44,6 +44,7 @@ #define NETDUMP_FINISHED 2 /* Send after finishing a dump. */ #define NETDUMP_VMCORE 3 /* Contains dump data. */ #define NETDUMP_KDH 4 /* Contains kernel dump header. */ +#define NETDUMP_EKCD_KEY 5 /* Contains kernel dump key. */ #define NETDUMP_DATASIZE 4096 /* Arbitrary packet size limit. */ Modified: user/markj/netdump/sys/netinet/netdump/netdump_client.c ============================================================================== --- user/markj/netdump/sys/netinet/netdump/netdump_client.c Fri Mar 9 21:32:07 2018 (r330705) +++ user/markj/netdump/sys/netinet/netdump/netdump_client.c Fri Mar 9 22:34:43 2018 (r330706) @@ -1006,14 +1006,17 @@ static int netdump_write_headers(struct dumperinfo *di, struct kerneldumpheader *kdh, void *key, uint32_t keysize) { + int error; - if (sizeof(*kdh) + keysize > sizeof(nd_buf)) - return (EINVAL); - memcpy(nd_buf, kdh, sizeof(*kdh)); - if (key != NULL) - memcpy(nd_buf + sizeof(*kdh), key, keysize); - return (netdump_send(NETDUMP_KDH, 0, nd_buf, sizeof(*kdh) + keysize)); + error = netdump_send(NETDUMP_KDH, 0, nd_buf, sizeof(*kdh)); + if (error == 0 && keysize > 0) { + if (keysize > sizeof(nd_buf)) + return (EINVAL); + memcpy(nd_buf, key, keysize); + error = netdump_send(NETDUMP_EKCD_KEY, 0, nd_buf, keysize); + } + return (error); } /*