From owner-svn-src-all@FreeBSD.ORG  Thu Aug 15 05:14:21 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 ESMTP id 15C5FF26;
 Thu, 15 Aug 2013 05:14:21 +0000 (UTC)
 (envelope-from tuexen@FreeBSD.org)
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 03B262327;
 Thu, 15 Aug 2013 05:14:21 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7F5EK8A052364;
 Thu, 15 Aug 2013 05:14:20 GMT (envelope-from tuexen@svn.freebsd.org)
Received: (from tuexen@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7F5EKbK052363;
 Thu, 15 Aug 2013 05:14:20 GMT (envelope-from tuexen@svn.freebsd.org)
Message-Id: <201308150514.r7F5EKbK052363@svn.freebsd.org>
From: Michael Tuexen <tuexen@FreeBSD.org>
Date: Thu, 15 Aug 2013 05:14:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-releng@freebsd.org
Subject: svn commit: r254355 - releng/9.2/sys/netinet
X-SVN-Group: releng
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.14
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: Thu, 15 Aug 2013 05:14:21 -0000

Author: tuexen
Date: Thu Aug 15 05:14:20 2013
New Revision: 254355
URL: http://svnweb.freebsd.org/changeset/base/254355

Log:
  MFC r254352:
  Don't send uninitialized memory (two instances of 4 bytes) in
  every cookie on the wire. This bug was reported in
  https://bugzilla.mozilla.org/show_bug.cgi?id=905080
  
  Approved by:	re@

Modified:
  releng/9.2/sys/netinet/sctp_output.c
Directory Properties:
  releng/9.2/sys/   (props changed)

Modified: releng/9.2/sys/netinet/sctp_output.c
==============================================================================
--- releng/9.2/sys/netinet/sctp_output.c	Thu Aug 15 04:35:25 2013	(r254354)
+++ releng/9.2/sys/netinet/sctp_output.c	Thu Aug 15 05:14:20 2013	(r254355)
@@ -5410,6 +5410,14 @@ do_a_abort:
 	}
 	SCTP_BUF_LEN(m) = sizeof(struct sctp_init_chunk);
 
+	/*
+	 * We might not overwrite the identification[] completely and on
+	 * some platforms time_entered will contain some padding. Therefore
+	 * zero out the cookie to avoid putting uninitialized memory on the
+	 * wire.
+	 */
+	memset(&stc, 0, sizeof(struct sctp_state_cookie));
+
 	/* the time I built cookie */
 	(void)SCTP_GETTIME_TIMEVAL(&stc.time_entered);