svn commit: r351635 - in stable: 11/sys/contrib/ipfilter/netinet 12/sys/contrib/ipfilter/netinet

[Cy Schubert]

Author: cy
Date: Sat Aug 31 04:26:59 2019
New Revision: 351635
URL: https://svnweb.freebsd.org/changeset/base/351635

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

Modified:
  stable/11/sys/contrib/ipfilter/netinet/ip_nat.c
Directory Properties:
  stable/11/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/12/sys/contrib/ipfilter/netinet/ip_nat.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/11/sys/contrib/ipfilter/netinet/ip_nat.c
==============================================================================
--- stable/11/sys/contrib/ipfilter/netinet/ip_nat.c	Sat Aug 31 04:25:35 2019	(r351634)
+++ stable/11/sys/contrib/ipfilter/netinet/ip_nat.c	Sat Aug 31 04:26:59 2019	(r351635)
@@ -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;
 }