From: Harald Welte <laforge@netfilter.org>
To: David Miller <davem@redhat.com>
Cc: Netfilter Development Mailinglist <netfilter-devel@lists.netfilter.org>
Subject: [PATCH 2.4] NETFILTER: fix broken debug assertion
Date: Mon, 2 Aug 2004 01:18:32 +0200 [thread overview]
Message-ID: <20040801231832.GH18758@sunbeam2> (raw)
[-- Attachment #1: Type: text/plain, Size: 2219 bytes --]
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 kaber@trash.net
# [NETFILTER]: Fix two more broken assertions
#
# Signed-off-by: Patrick McHardy <kaber@trash.net>
# Signed-off-by: Harald Welte <laforge@netfilter.org>
#
# net/ipv4/netfilter/ipt_MASQUERADE.c
# 2004/06/23 00:25:18+02:00 kaber@trash.net +2 -2
# [NETFILTER]: Fix two more broken assertions
#
# net/ipv4/netfilter/ip_nat_rule.c
# 2004/06/23 00:25:18+02:00 kaber@trash.net +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);
diff -Nru a/net/ipv4/netfilter/ipt_MASQUERADE.c b/net/ipv4/netfilter/ipt_MASQUERADE.c
--- a/net/ipv4/netfilter/ipt_MASQUERADE.c 2004-06-23 00:26:25 +02:00
+++ b/net/ipv4/netfilter/ipt_MASQUERADE.c 2004-06-23 00:26:25 +02:00
@@ -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;
--
- Harald Welte <laforge@netfilter.org> 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
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 189 bytes --]
next reply other threads:[~2004-08-01 23:18 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-08-01 23:18 Harald Welte [this message]
2004-08-02 2:41 ` [PATCH 2.4] NETFILTER: fix broken debug assertion David S. Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20040801231832.GH18758@sunbeam2 \
--to=laforge@netfilter.org \
--cc=davem@redhat.com \
--cc=netfilter-devel@lists.netfilter.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.