diff options
| author | Patrick McHardy <kaber@coreworks.de> | 2004-09-23 00:46:15 -0700 |
|---|---|---|
| committer | David S. Miller <davem@kernel.bkbits.net> | 2004-09-23 00:46:15 -0700 |
| commit | f86c7b28768511304c76513002bcc7ee4ca3f53b (patch) | |
| tree | 2223f91e99a39b0c50f7489b329a6310c05a270a | |
| parent | b2ca3f5f6b0afb46c5d1fef08a68a451375ca8c2 (diff) | |
[NETFILTER]: Fix two broken assertions
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/ipv4/netfilter/ip_conntrack_core.c | 2 | ||||
| -rw-r--r-- | net/ipv4/netfilter/ip_nat_core.c | 8 |
2 files changed, 3 insertions, 7 deletions
diff --git a/net/ipv4/netfilter/ip_conntrack_core.c b/net/ipv4/netfilter/ip_conntrack_core.c index 2d7fc9b9e570..ba78b5690d63 100644 --- a/net/ipv4/netfilter/ip_conntrack_core.c +++ b/net/ipv4/netfilter/ip_conntrack_core.c @@ -590,7 +590,7 @@ init_conntrack(const struct ip_conntrack_tuple *tuple, DEBUGP("conntrack: expectation arrives ct=%p exp=%p\n", conntrack, expected); /* Welcome, Mr. Bond. We've been expecting you... */ - IP_NF_ASSERT(master_ct(conntrack)); + IP_NF_ASSERT(expected->expectant); __set_bit(IPS_EXPECTED_BIT, &conntrack->status); conntrack->master = expected; expected->sibling = conntrack; diff --git a/net/ipv4/netfilter/ip_nat_core.c b/net/ipv4/netfilter/ip_nat_core.c index 49595abe2609..1ecc3f28516a 100644 --- a/net/ipv4/netfilter/ip_nat_core.c +++ b/net/ipv4/netfilter/ip_nat_core.c @@ -852,12 +852,8 @@ icmp_reply_translation(struct sk_buff **pskb, } /* Must be RELATED */ - IP_NF_ASSERT((*pskb)->nfct - - ((struct ip_conntrack *)(*pskb)->nfct->master)->infos - == IP_CT_RELATED - || (*pskb)->nfct - - ((struct ip_conntrack *)(*pskb)->nfct->master)->infos - == IP_CT_RELATED+IP_CT_IS_REPLY); + IP_NF_ASSERT((*pskb)->nfctinfo == IP_CT_RELATED || + (*pskb)->nfctinfo == IP_CT_RELATED+IP_CT_IS_REPLY); /* Redirects on non-null nats must be dropped, else they'll start talking to each other without our translation, and be |