[src/trunk]: src/sys/net/npf npf_conn_establish: fix the previous change - dr...

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

details:   https://anonhg.NetBSD.org/src/rev/1942ad90b265
branches:  trunk
changeset: 335998:1942ad90b265
user:      rmind <rmind%NetBSD.org@localhost>
date:      Thu Feb 05 22:04:03 2015 +0000

description:
npf_conn_establish: fix the previous change - drop the reference on error.

diffstat:

 sys/net/npf/npf_conn.c |  10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diffs (38 lines):

diff -r f0b28f0bb177 -r 1942ad90b265 sys/net/npf/npf_conn.c
--- a/sys/net/npf/npf_conn.c    Thu Feb 05 21:50:42 2015 +0000
+++ b/sys/net/npf/npf_conn.c    Thu Feb 05 22:04:03 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: npf_conn.c,v 1.15 2015/02/01 22:41:22 rmind Exp $      */
+/*     $NetBSD: npf_conn.c,v 1.16 2015/02/05 22:04:03 rmind Exp $      */
 
 /*-
  * Copyright (c) 2014-2015 Mindaugas Rasiukevicius <rmind at netbsd org>
@@ -99,7 +99,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: npf_conn.c,v 1.15 2015/02/01 22:41:22 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npf_conn.c,v 1.16 2015/02/05 22:04:03 rmind Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
@@ -528,8 +528,8 @@
         * here since there might be references acquired already.
         */
        if (error) {
-               const u_int dflags = CONN_REMOVED | CONN_EXPIRE;
-               atomic_or_uint(&con->c_flags, dflags);
+               atomic_or_uint(&con->c_flags, CONN_REMOVED | CONN_EXPIRE);
+               atomic_dec_uint(&con->c_refcnt);
                npf_stats_inc(NPF_STAT_RACE_CONN);
        } else {
                NPF_PRINTF(("NPF: establish conn %p\n", con));
@@ -569,6 +569,8 @@
 /*
  * npf_conn_setnat: associate NAT entry with the connection, update and
  * re-insert connection entry using the translation values.
+ *
+ * => The caller must be holding a reference.
  */
 int
 npf_conn_setnat(const npf_cache_t *npc, npf_conn_t *con,