From owner-svn-src-stable-9@FreeBSD.ORG  Sun May 18 14:18:24 2014
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 15FFFB08;
 Sun, 18 May 2014 14:18:24 +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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 02B8A2DB6;
 Sun, 18 May 2014 14:18:24 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4IEINvh031603;
 Sun, 18 May 2014 14:18:23 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4IEINVJ031602;
 Sun, 18 May 2014 14:18:23 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201405181418.s4IEINVJ031602@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Sun, 18 May 2014 14:18:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r266398 - stable/9/sys/contrib/pf/net
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
 <svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable-9>, 
 <mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9/>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
 <mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 18 May 2014 14:18:24 -0000

Author: jhb
Date: Sun May 18 14:18:23 2014
New Revision: 266398
URL: http://svnweb.freebsd.org/changeset/base/266398

Log:
  MFC 260377:
  When pf_get_translation() fails, it should leave *sn pointer pristine,
  otherwise we will panic in pf_test_rule().
  
  PR:		amd64/189741
  Tested by:	Nick Rogers <ncrogers@gmail.com>

Modified:
  stable/9/sys/contrib/pf/net/pf_lb.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/sys/   (props changed)

Modified: stable/9/sys/contrib/pf/net/pf_lb.c
==============================================================================
--- stable/9/sys/contrib/pf/net/pf_lb.c	Sun May 18 13:05:07 2014	(r266397)
+++ stable/9/sys/contrib/pf/net/pf_lb.c	Sun May 18 14:18:23 2014	(r266398)
@@ -788,6 +788,7 @@ pf_get_translation(struct pf_pdesc *pd, 
 			pool_put(&pf_state_key_pl, *skp);
 #endif
 			*skw = *sks = *nkp = *skp = NULL;
+			*sn = NULL;
 			return (NULL);
 		}
 	}