From owner-svn-src-all@FreeBSD.ORG  Tue Nov 19 09:35:20 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id C9EA6C8C;
 Tue, 19 Nov 2013 09:35:20 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id B842D206D;
 Tue, 19 Nov 2013 09:35:20 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAJ9ZKeg037826;
 Tue, 19 Nov 2013 09:35:20 GMT (envelope-from des@svn.freebsd.org)
Received: (from des@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAJ9ZKgJ037825;
 Tue, 19 Nov 2013 09:35:20 GMT (envelope-from des@svn.freebsd.org)
Message-Id: <201311190935.rAJ9ZKgJ037825@svn.freebsd.org>
From: Dag-Erling Smørgrav <des@FreeBSD.org>
Date: Tue, 19 Nov 2013 09:35:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r258335 - stable/10/crypto/openssh
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.16
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 19 Nov 2013 09:35:20 -0000

Author: des
Date: Tue Nov 19 09:35:20 2013
New Revision: 258335
URL: http://svnweb.freebsd.org/changeset/base/258335

Log:
  Pre-zero the MAC context.
  
  Security:	CVE-2013-4548
  Security:	FreeBSD-SA-13:14.openssh
  Approved by:	re (implicit)

Modified:
  stable/10/crypto/openssh/monitor_wrap.c

Modified: stable/10/crypto/openssh/monitor_wrap.c
==============================================================================
--- stable/10/crypto/openssh/monitor_wrap.c	Tue Nov 19 01:07:25 2013	(r258334)
+++ stable/10/crypto/openssh/monitor_wrap.c	Tue Nov 19 09:35:20 2013	(r258335)
@@ -482,7 +482,7 @@ mm_newkeys_from_blob(u_char *blob, int b
 	buffer_init(&b);
 	buffer_append(&b, blob, blen);
 
-	newkey = xmalloc(sizeof(*newkey));
+	newkey = xcalloc(1, sizeof(*newkey));
 	enc = &newkey->enc;
 	mac = &newkey->mac;
 	comp = &newkey->comp;