Tue Dec 30 19:11:44 2014 UTC ()

Don't forget to destroy the mutex before freeing the nat struct on a failed
load.
XXX: pullup -7


(christos)

diff -r1.38 -r1.39 src/sys/net/npf/npf_nat.c

--- src/sys/net/npf/npf_nat.c 2014/12/20 16:19:43	1.38
+++ src/sys/net/npf/npf_nat.c 2014/12/30 19:11:44	1.39

 @@ -1,14 +1,14 @@
-/*	$NetBSD: npf_nat.c,v 1.38 2014/12/20 16:19:43 rmind Exp $	*/
+/*	$NetBSD: npf_nat.c,v 1.39 2014/12/30 19:11:44 christos Exp $	*/
 /*-
  * Copyright (c) 2014 Mindaugas Rasiukevicius <rmind at netbsd org>
  * Copyright (c) 2010-2013 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This material is based upon work partially supported by The
  * NetBSD Foundation under a contract with Mindaugas Rasiukevicius.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -61,27 +61,27 @@
+ *
  * Connections, translation entries and their life-cycle
+ *
  *	NAT module relies on connection tracking module.  Each translated
  *	connection has an associated translation entry (npf_nat_t), which
  *	contains information used for backwards stream translation, i.e.
  *	original IP address with port and translation port, allocated from
  *	the port map.  Each NAT entry is associated with the policy, which
  *	contains translation IP address.  Allocated port is returned to the
  *	port map and NAT entry is destroyed when connection expires.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: npf_nat.c,v 1.38 2014/12/20 16:19:43 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npf_nat.c,v 1.39 2014/12/30 19:11:44 christos Exp $");
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/atomic.h>
 #include <sys/bitops.h>
 #include <sys/condvar.h>
 #include <sys/kmem.h>
 #include <sys/mutex.h>
 #include <sys/pool.h>
 #include <sys/proc.h>
 #include <sys/cprng.h>
 @@ -246,26 +246,27 @@ npf_nat_newpolicy(prop_dictionary_t natd
 	 */
 	if (!npf_ruleset_sharepm(rset, np)) {
 		/* Allocate a new port map for the NAT policy. */
 		pm = kmem_zalloc(PORTMAP_MEM_SIZE, KM_SLEEP);
 		pm->p_refcnt = 1;
 		KASSERT((uintptr_t)pm->p_bitmap == (uintptr_t)pm + sizeof(*pm));
 		np->n_portmap = pm;
 	} else {
 		KASSERT(np->n_portmap != NULL);
 		KASSERT(np->n_portmap->p_refcnt > 0);
+	}
 	return np;
 err:
 	mutex_destroy(&np->n_lock);
 	kmem_free(np, sizeof(npf_natpolicy_t));
 	return NULL;
+}
 int
 npf_nat_policyexport(const npf_natpolicy_t *np, prop_dictionary_t natdict)
+{
 	prop_data_t d;
 	prop_dictionary_set_int32(natdict, "type", np->n_type);
 	prop_dictionary_set_uint32(natdict, "flags", np->n_flags);
 	d = prop_data_create_data(&np->n_taddr, np->n_alen);