[src/netbsd-7]: src/sys/net/npf Pull up following revision(s) (requested by r...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f64f60904634
branches:  netbsd-7
changeset: 798778:f64f60904634
user:      martin <martin%NetBSD.org@localhost>
date:      Sun Jan 04 11:37:38 2015 +0000

description:
Pull up following revision(s) (requested by rmind in ticket #374):
        sys/net/npf/npf_nat.c: revision 1.39
Don't forget to destroy the mutex before freeing the nat struct on a failed
load.

diffstat:

 sys/net/npf/npf_nat.c |  5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diffs (26 lines):

diff -r 1e8129928461 -r f64f60904634 sys/net/npf/npf_nat.c
--- a/sys/net/npf/npf_nat.c     Sun Jan 04 11:19:00 2015 +0000
+++ b/sys/net/npf/npf_nat.c     Sun Jan 04 11:37:38 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: npf_nat.c,v 1.32.2.4 2014/12/22 02:10:30 msaitoh Exp $ */
+/*     $NetBSD: npf_nat.c,v 1.32.2.5 2015/01/04 11:37:38 martin Exp $  */
 
 /*-
  * Copyright (c) 2014 Mindaugas Rasiukevicius <rmind at netbsd org>
@@ -71,7 +71,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: npf_nat.c,v 1.32.2.4 2014/12/22 02:10:30 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npf_nat.c,v 1.32.2.5 2015/01/04 11:37:38 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
@@ -256,6 +256,7 @@
        }
        return np;
 err:
+       mutex_destroy(&np->n_lock);
        kmem_free(np, sizeof(npf_natpolicy_t));
        return NULL;
 }