NETFILTER: fix broken debug assertion
Subsystems (2)
PATCH 1/1 NETFILTER: fix broken debug assertion
Hi Dave!
This patch fixes the broken netfilter assertions in 2.4.x.
Please apply, thanks.
# This is a BitKeeper generated diff -Nru style patch. #
# ChangeSet
# 2004/06/23 00:25:21+02:00 [email protected]
# [NETFILTER]: Fix two more broken assertions
#
# Signed-off-by: Patrick McHardy <[email protected]>
# Signed-off-by: Harald Welte <[email protected]>
#
# net/ipv4/netfilter/ipt_MASQUERADE.c
# 2004/06/23 00:25:18+02:00 [email protected] +2 -2
# [NETFILTER]: Fix two more broken assertions
#
# net/ipv4/netfilter/ip_nat_rule.c # 2004/06/23 00:25:18+02:00 [email protected] +2 -1 # [NETFILTER]: Fix two more broken assertions # diff -Nru a/net/ipv4/netfilter/ip_nat_rule.c b/net/ipv4/netfilter/ip_nat_rule.c --- a/net/ipv4/netfilter/ip_nat_rule.c 2004-06-23 00:26:25 +02:00 +++ b/net/ipv4/netfilter/ip_nat_rule.c 2004-06-23 00:26:25 +02:00 @@ -121,7 +121,8 @@ ct = ip_conntrack_get(*pskb, &ctinfo);
/* Connection must be valid and new. */
- IP_NF_ASSERT(ct && (ctinfo == IP_CT_NEW || ctinfo == IP_CT_RELATED)); + IP_NF_ASSERT(ct && (ctinfo == IP_CT_NEW || ctinfo == IP_CT_RELATED
+ || ctinfo == IP_CT_RELATED + IP_CT_IS_REPLY));
IP_NF_ASSERT(out);
return ip_nat_setup_info(ct, targinfo, hooknum);
net/ipv4/netfilter/ipt_MASQUERADE.c +2 -2
@@ -79,8 +79,8 @@return NF_ACCEPT ; ct =ip_conntrack_get (*pskb, &ctinfo); -IP_NF_ASSERT (ct && (ctinfo ==IP_CT_NEW - || ctinfo ==IP_CT_RELATED )); +IP_NF_ASSERT (ct && (ctinfo ==IP_CT_NEW || ctinfo ==IP_CT_RELATED + || ctinfo ==IP_CT_RELATED +IP_CT_IS_REPLY )); mr = targinfo;
Signature · 5 lines
- Harald Welte <[email protected]> http://www.netfilter.org/ ============================================================================ "Fragmentation is like classful addressing -- an interesting early architectural error that shows how much experimentation was going on while IP was being designed." -- Paul Vixie
David S. Miller
AppliedQuoted 1 line · On Mon, 2 Aug 2004 01:18:32 +0200 Harald Welte <[email protected]> wrote:
This patch fixes the broken netfilter assertions in 2.4.x.
Applied.