svn commit: r351562 - head/sys/contrib/ipfilter/netinet

[Cy Schubert]

Author: cy
Date: Wed Aug 28 04:55:03 2019
New Revision: 351562
URL: https://svnweb.freebsd.org/changeset/base/351562

Log:
  Destroy the mutex in case of error.
  
  Obtained from:	NetBSD ip_nat.c r1.7
  MFC after:	3 days

Modified:
  head/sys/contrib/ipfilter/netinet/ip_nat.c

Modified: head/sys/contrib/ipfilter/netinet/ip_nat.c
==============================================================================
--- head/sys/contrib/ipfilter/netinet/ip_nat.c	Wed Aug 28 04:54:26 2019	(r351561)
+++ head/sys/contrib/ipfilter/netinet/ip_nat.c	Wed Aug 28 04:55:03 2019	(r351562)
@@ -3078,7 +3078,7 @@ ipf_nat_newrdr(fin, nat, ni)
 /* creating a new NAT structure for a "RDR" rule (incoming NAT translation) */
 /* and (3) building that structure and putting it into the NAT table(s).    */
 /*                                                                          */
-/* NOTE: natsave should NOT be used top point back to an ipstate_t struct   */
+/* NOTE: natsave should NOT be used to point back to an ipstate_t struct    */
 /*       as it can result in memory being corrupted.                        */
 /* ------------------------------------------------------------------------ */
 nat_t *
@@ -3406,6 +3406,7 @@ ipf_nat_insert(softc, softn, nat)
 	u_int hv0, hv1;
 	u_int sp, dp;
 	ipnat_t *in;
+	int ret;
 
 	/*
 	 * Try and return an error as early as possible, so calculate the hash
@@ -3488,7 +3489,10 @@ ipf_nat_insert(softc, softn, nat)
 		nat->nat_mtu[1] = GETIFMTU_4(nat->nat_ifps[1]);
 	}
 
-	return ipf_nat_hashtab_add(softc, softn, nat);
+	ret = ipf_nat_hashtab_add(softc, softn, nat);
+	if (ret == -1)
+		MUTEX_DESTROY(&nat->nat_lock);
+	return ret;
 }