From: Jan Lentfer <Jan.Lentfer@web.de>
Date: Thu, 9 Sep 2010 13:54:56 +0000 (+0200)
Subject: pf: Update pf.c to fix memory leak
X-Git-Tag: v2.9.0~241^2~15
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/05ac5751393fbacdabf97a4ac71cf75bd148fe3d

pf: Update pf.c to fix memory leak

	pf.c 1.552.2.1 2007/11/27 fixes a memory leak issue.
	This was MFC'd to OpenBSD 4.2
---

diff --git a/sys/net/pf/pf.c b/sys/net/pf/pf.c
index 7c0bc5941a..5b34310db9 100644
--- a/sys/net/pf/pf.c
+++ b/sys/net/pf/pf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pf.c,v 1.552 2007/08/21 15:57:27 dhartmei Exp $ */
+/*	$OpenBSD: pf.c,v 1.552.2.1 2007/11/27 16:37:57 henning Exp $ */
 
 /*
  * Copyright (c) 2004 The DragonFly Project.  All rights reserved.
@@ -848,6 +848,8 @@ pf_insert_state(struct pfi_kif *kif, struct pf_state *s)
 		TAILQ_FOREACH(sp, &cur->states, next)
 			if (sp->kif == kif) {	/* collision! */
 				pf_stateins_err("tree_lan_ext", s, kif);
+				pf_detach_state(s,
+				    PF_DT_SKIP_LANEXT|PF_DT_SKIP_EXTGWY);
 				return (-1);
 			}
 		pf_detach_state(s, PF_DT_SKIP_LANEXT|PF_DT_SKIP_EXTGWY);
@@ -1013,10 +1015,8 @@ pf_src_tree_remove_state(struct pf_state *s)
 	u_int32_t timeout;
 
 	if (s->src_node != NULL) {
-		if (s->state_key->proto == IPPROTO_TCP) {
-			if (s->src.tcp_est)
-				--s->src_node->conn;
-		}
+		if (s->src.tcp_est)
+			--s->src_node->conn;
 		if (--s->src_node->states <= 0) {
 			timeout = s->rule.ptr->timeout[PFTM_SRC_NODE];
 			if (!timeout)