From owner-svn-soc-all@freebsd.org  Tue Dec  1 23:09:26 2015
Return-Path: <owner-svn-soc-all@freebsd.org>
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 9AF92A3E7EC
 for <svn-soc-all@mailman.ysv.freebsd.org>;
 Tue,  1 Dec 2015 23:09:26 +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 8599E1DE1
 for <svn-soc-all@FreeBSD.org>; Tue,  1 Dec 2015 23:09:26 +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 tB1N9QYD078571
 for <svn-soc-all@FreeBSD.org>; Tue, 1 Dec 2015 23:09:26 GMT
 (envelope-from def@FreeBSD.org)
Received: (from www@localhost)
 by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id tB1N9PYF078569
 for svn-soc-all@FreeBSD.org; Tue, 1 Dec 2015 23:09:25 GMT
 (envelope-from def@FreeBSD.org)
Date: Tue, 1 Dec 2015 23:09:25 GMT
Message-Id: <201512012309.tB1N9PYF078569@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: r294726 - soc2013/def/crashdump-head/sbin/dumpon
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
 <svn-soc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all/>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 01 Dec 2015 23:09:26 -0000

Author: def
Date: Tue Dec  1 23:09:25 2015
New Revision: 294726
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=294726

Log:
  Verify if a public key is no longer than 16384b.

Modified:
  soc2013/def/crashdump-head/sbin/dumpon/dumpon.c

Modified: soc2013/def/crashdump-head/sbin/dumpon/dumpon.c
==============================================================================
--- soc2013/def/crashdump-head/sbin/dumpon/dumpon.c	Tue Dec  1 22:50:32 2015	(r294725)
+++ soc2013/def/crashdump-head/sbin/dumpon/dumpon.c	Tue Dec  1 23:09:25 2015	(r294726)
@@ -132,6 +132,11 @@
 		errx(1, "Unable to read data from %s.", pubkeyfile);
 
 	kda->kda_encryptedkeysize = RSA_size(pubkey);
+	if (kda->kda_encryptedkeysize > KERNELDUMP_ENCKEY_MAX_SIZE) {
+		errx(1, "Public key has to be at most %db long.",
+		    8 * KERNELDUMP_ENCKEY_MAX_SIZE);
+	}
+
 	kda->kda_encryptedkey = calloc(1, kda->kda_encryptedkeysize);
 	if (kda->kda_encryptedkey == NULL)
 		err(1, "Unable to allocate encrypted key");