svn commit: r266398 - stable/9/sys/contrib/pf/net

[John Baldwin]

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 at 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);
 		}
 	}