From owner-svn-src-projects@FreeBSD.ORG  Fri Aug 10 11:01:56 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 313ED106567A;
	Fri, 10 Aug 2012 11:01:56 +0000 (UTC)
	(envelope-from glebius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D54988FC14;
	Fri, 10 Aug 2012 11:01:55 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q7AB1t8p025713;
	Fri, 10 Aug 2012 11:01:55 GMT (envelope-from glebius@svn.freebsd.org)
Received: (from glebius@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7AB1t0v025711;
	Fri, 10 Aug 2012 11:01:55 GMT (envelope-from glebius@svn.freebsd.org)
Message-Id: <201208101101.q7AB1t0v025711@svn.freebsd.org>
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Fri, 10 Aug 2012 11:01:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r239173 - projects/pf/head/sys/contrib/pf/net
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 10 Aug 2012 11:01:56 -0000

Author: glebius
Date: Fri Aug 10 11:01:55 2012
New Revision: 239173
URL: http://svn.freebsd.org/changeset/base/239173

Log:
  Catch up with r238421 in pfsync. We need to initalize allocated keys.
  
  Reported by:	Ben Wilber <ben desync.com>

Modified:
  projects/pf/head/sys/contrib/pf/net/if_pfsync.c

Modified: projects/pf/head/sys/contrib/pf/net/if_pfsync.c
==============================================================================
--- projects/pf/head/sys/contrib/pf/net/if_pfsync.c	Fri Aug 10 09:04:02 2012	(r239172)
+++ projects/pf/head/sys/contrib/pf/net/if_pfsync.c	Fri Aug 10 11:01:55 2012	(r239173)
@@ -460,17 +460,23 @@ pfsync_state_import(struct pfsync_state 
 	if ((st = uma_zalloc(V_pf_state_z, M_NOWAIT | M_ZERO)) == NULL)
 		goto cleanup;
 
-	if ((skw = uma_zalloc(V_pf_state_key_z, M_NOWAIT)) == NULL)
+	if ((skw = uma_zalloc(V_pf_state_key_z, M_NOWAIT | M_ZERO)) == NULL)
 		goto cleanup;
 
+	TAILQ_INIT(&skw->states[PF_SK_WIRE]);
+	TAILQ_INIT(&skw->states[PF_SK_STACK]);
+
 	if (PF_ANEQ(&sp->key[PF_SK_WIRE].addr[0],
 	    &sp->key[PF_SK_STACK].addr[0], sp->af) ||
 	    PF_ANEQ(&sp->key[PF_SK_WIRE].addr[1],
 	    &sp->key[PF_SK_STACK].addr[1], sp->af) ||
 	    sp->key[PF_SK_WIRE].port[0] != sp->key[PF_SK_STACK].port[0] ||
 	    sp->key[PF_SK_WIRE].port[1] != sp->key[PF_SK_STACK].port[1]) {
-		if ((sks = uma_zalloc(V_pf_state_key_z, M_NOWAIT)) == NULL)
+		sks = uma_zalloc(V_pf_state_key_z, M_NOWAIT | M_ZERO);
+		if (sks == NULL)
 			goto cleanup;
+		TAILQ_INIT(&sks->states[PF_SK_WIRE]);
+		TAILQ_INIT(&sks->states[PF_SK_STACK]);
 	} else
 		sks = skw;