瀏覽代碼

[NETFILTER]: Don't use conntrack entry after dropping the reference

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Patrick McHardy 19 年之前
父節點
當前提交
2fdf1faa8e
共有 1 個文件被更改,包括 2 次插入4 次删除
  1. 2 4
      net/ipv4/netfilter/ip_conntrack_netlink.c

+ 2 - 4
net/ipv4/netfilter/ip_conntrack_netlink.c

@@ -728,11 +728,9 @@ ctnetlink_del_conntrack(struct sock *ctnl, struct sk_buff *skb,
 			return -ENOENT;
 			return -ENOENT;
 		}
 		}
 	}	
 	}	
-	if (del_timer(&ct->timeout)) {
-		ip_conntrack_put(ct);
+	if (del_timer(&ct->timeout))
 		ct->timeout.function((unsigned long)ct);
 		ct->timeout.function((unsigned long)ct);
-		return 0;
-	}
+
 	ip_conntrack_put(ct);
 	ip_conntrack_put(ct);
 	DEBUGP("leaving\n");
 	DEBUGP("leaving\n");