netfilter-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Pablo Neira Ayuso <pablo@netfilter.org>
To: davem@davemloft.net
Cc: netfilter-devel@vger.kernel.org
Subject: Re: [PATCH 8/8] netfilter: revert a2361c8735e07322023aedc36e4938b35af31eb0
Date: Tue, 10 May 2011 12:14:16 +0200	[thread overview]
Message-ID: <4DC90FF8.90500@netfilter.org> (raw)
In-Reply-To: <1305021959-2980-9-git-send-email-pablo@netfilter.org>

[-- Attachment #1: Type: text/plain, Size: 512 bytes --]

On 10/05/11 12:05, pablo@netfilter.org wrote:
> From: Pablo Neira Ayuso <pablo@netfilter.org>
> 
> This patch reverts a2361c8735e07322023aedc36e4938b35af31eb0:
> "[PATCH] netfilter: xt_conntrack: warn about use in raw table"
> 
> Florian Wesphal says:
> "... when the packet was sent from the local machine the skb
> already has ->nfct attached, and -m conntrack seems to do
> the right thing."

Sorry, the description and the patch doesn't match, the correct patch is
attached. I have pushed this to my branch.

[-- Attachment #2: 0008-netfilter-revert-a2361c8735e07322023aedc36e4938b35af.patch --]
[-- Type: text/x-patch, Size: 1302 bytes --]

>From 93bbce1ad0cd788190dd7d6c17d289f771fe3d0d Mon Sep 17 00:00:00 2001
From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Tue, 10 May 2011 12:13:36 +0200
Subject: [PATCH] netfilter: revert a2361c8735e07322023aedc36e4938b35af31eb0

This patch reverts a2361c8735e07322023aedc36e4938b35af31eb0:
"[PATCH] netfilter: xt_conntrack: warn about use in raw table"

Florian Wesphal says:
"... when the packet was sent from the local machine the skb
already has ->nfct attached, and -m conntrack seems to do
the right thing."

Acked-by: Jan Engelhardt <jengelh@medozas.de>
Reported-by: Florian Wesphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
 net/netfilter/xt_conntrack.c |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)

diff --git a/net/netfilter/xt_conntrack.c b/net/netfilter/xt_conntrack.c
index 481a86f..61805d7 100644
--- a/net/netfilter/xt_conntrack.c
+++ b/net/netfilter/xt_conntrack.c
@@ -272,11 +272,6 @@ static int conntrack_mt_check(const struct xt_mtchk_param *par)
 {
 	int ret;
 
-	if (strcmp(par->table, "raw") == 0) {
-		pr_info("state is undetermined at the time of raw table\n");
-		return -EINVAL;
-	}
-
 	ret = nf_ct_l3proto_try_module_get(par->family);
 	if (ret < 0)
 		pr_info("cannot load conntrack support for proto=%u\n",
-- 
1.7.2.3


  reply	other threads:[~2011-05-10 10:14 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-05-10 10:05 [PATCH 0/8] netfilter: netfilter fixes for 2.6.39-rc7 pablo
2011-05-10 10:05 ` [PATCH 1/8] netfilter: ctnetlink: fix timestamp support for new conntracks pablo
2011-05-10 10:05 ` [PATCH 2/8] netfilter: fix ebtables compat support pablo
2011-05-15 16:34   ` Pablo Neira Ayuso
2011-05-10 10:05 ` [PATCH 3/8] netfilter: ebtables: only call xt_compat_add_offset once per rule pablo
2011-05-10 10:05 ` [PATCH 4/8] IPVS: Change of socket usage to enable name space exit pablo
2011-05-10 10:05 ` [PATCH 5/8] IPVS: init and cleanup restructuring pablo
2011-05-10 10:05 ` [PATCH 6/8] netfilter: IPv6: initialize TOS field in REJECT target module pablo
2011-05-11  5:12   ` Fernando Luis Vázquez Cao
2011-05-12  8:23     ` Pablo Neira Ayuso
2011-05-12  8:33       ` Fernando Luis Vázquez Cao
2011-05-10 10:05 ` [PATCH 7/8] netfilter: IPv6: fix DSCP mangle code pablo
2011-05-10 10:05 ` [PATCH 8/8] netfilter: revert a2361c8735e07322023aedc36e4938b35af31eb0 pablo
2011-05-10 10:14   ` Pablo Neira Ayuso [this message]
2011-05-10 19:01 ` [PATCH 0/8] netfilter: netfilter fixes for 2.6.39-rc7 David 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=4DC90FF8.90500@netfilter.org \
    --to=pablo@netfilter.org \
    --cc=davem@davemloft.net \
    --cc=netfilter-devel@vger.kernel.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).