From owner-svn-src-projects@FreeBSD.ORG Wed Mar 7 22:09:41 2012 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 272B3106564A; Wed, 7 Mar 2012 22:09:41 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id F17848FC12; Wed, 7 Mar 2012 22:09:40 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q27M9elg012528; Wed, 7 Mar 2012 22:09:40 GMT (envelope-from glebius@svn.freebsd.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q27M9eO9012526; Wed, 7 Mar 2012 22:09:40 GMT (envelope-from glebius@svn.freebsd.org) Message-Id: <201203072209.q27M9eO9012526@svn.freebsd.org> From: Gleb Smirnoff Date: Wed, 7 Mar 2012 22:09:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r232673 - projects/pf/head/sys/contrib/pf/net X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Mar 2012 22:09:41 -0000 Author: glebius Date: Wed Mar 7 22:09:40 2012 New Revision: 232673 URL: http://svn.freebsd.org/changeset/base/232673 Log: Re-do r232663 in less ugly way, incidentally pluging a key leak. Modified: projects/pf/head/sys/contrib/pf/net/pf.c Modified: projects/pf/head/sys/contrib/pf/net/pf.c ============================================================================== --- projects/pf/head/sys/contrib/pf/net/pf.c Wed Mar 7 20:55:23 2012 (r232672) +++ projects/pf/head/sys/contrib/pf/net/pf.c Wed Mar 7 22:09:40 2012 (r232673) @@ -695,7 +695,7 @@ pf_state_key_attach(struct pf_state_key si->dst.state >= TCPS_FIN_WAIT_2) { si->src.state = si->dst.state = TCPS_CLOSED; - /* Unlink later or sk can go away. */ + /* Unlink later or cur can go away. */ olds = si; } else { if (V_pf_status.debug >= PF_DEBUG_MISC) { @@ -722,9 +722,12 @@ pf_state_key_attach(struct pf_state_key } } /* - * Collided key is later freed in pf_state_insert(). - * XXXGL: should be redesigned. + * Collided key may be the same we are trying to attach, + * this happens for non-NAT states, they are attached + * twice: via PF_SK_WIRE and PF_SK_STACK tailqs. */ + if (cur != sk) + uma_zfree(V_pf_state_key_z, sk); s->key[idx] = cur; } else s->key[idx] = sk; @@ -758,14 +761,13 @@ static void pf_state_key_detach(struct pf_state *s, int idx) { struct pf_state_key *sk = s->key[idx]; - int idx2 = (idx == PF_SK_STACK ? PF_SK_WIRE : PF_SK_STACK); PF_KEYS_ASSERT(); TAILQ_REMOVE(&sk->states[idx], s, key_list[idx]); s->key[idx] = NULL; - if (TAILQ_EMPTY(&sk->states[idx]) && TAILQ_EMPTY(&sk->states[idx2])) { + if (TAILQ_EMPTY(&sk->states[0]) && TAILQ_EMPTY(&sk->states[1])) { RB_REMOVE(pf_state_tree, &V_pf_statetbl, sk); if (sk->reverse) sk->reverse->reverse = NULL; @@ -811,17 +813,25 @@ int pf_state_insert(struct pfi_kif *kif, struct pf_state_key *skw, struct pf_state_key *sks, struct pf_state *s) { + int samekeys; + + if (sks == skw) + samekeys = 1; + else + samekeys = 0; s->kif = kif; PF_KEYS_LOCK(); if (pf_state_key_attach(skw, s, PF_SK_WIRE)) { PF_KEYS_UNLOCK(); + if (!samekeys) + uma_zfree(V_pf_state_key_z, sks); return (-1); } - - if (s->key[PF_SK_WIRE] != skw && skw != sks) - uma_zfree(V_pf_state_key_z, skw); + /* In case if pf_state_key_attach() used another key. */ + if (samekeys) + sks = s->key[PF_SK_WIRE]; if (pf_state_key_attach(sks, s, PF_SK_STACK)) { pf_state_key_detach(s, PF_SK_WIRE); @@ -829,9 +839,6 @@ pf_state_insert(struct pfi_kif *kif, str return (-1); } - if (s->key[PF_SK_STACK] != sks && s->key[PF_SK_WIRE] != sks) - uma_zfree(V_pf_state_key_z, sks); - if (s->id == 0 && s->creatorid == 0) { s->id = htobe64(V_pf_status.stateid++); s->creatorid = V_pf_status.hostid;