* [PATCH] [NETFILTER]: fix ebtable targets return
@ 2008-02-21 5:36 Joonwoo Park
2008-02-21 5:45 ` David Miller
0 siblings, 1 reply; 4+ messages in thread
From: Joonwoo Park @ 2008-02-21 5:36 UTC (permalink / raw)
To: Patrick McHardy; +Cc: Joonwoo Park, David Miller, netfilter-devel, netdev
The function ebt_do_table doesn't take NF_DROP as a verdict from the targets.
Signed-off-by: Joonwoo Park <joonwpark81@gmail.com>
---
net/bridge/netfilter/ebt_dnat.c | 2 +-
net/bridge/netfilter/ebt_redirect.c | 2 +-
net/bridge/netfilter/ebt_snat.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/net/bridge/netfilter/ebt_dnat.c b/net/bridge/netfilter/ebt_dnat.c
index 1ec671d..ca64c1c 100644
--- a/net/bridge/netfilter/ebt_dnat.c
+++ b/net/bridge/netfilter/ebt_dnat.c
@@ -21,7 +21,7 @@ static int ebt_target_dnat(struct sk_buff *skb, unsigned int hooknr,
const struct ebt_nat_info *info = data;
if (!skb_make_writable(skb, 0))
- return NF_DROP;
+ return EBT_DROP;
memcpy(eth_hdr(skb)->h_dest, info->mac, ETH_ALEN);
return info->target;
diff --git a/net/bridge/netfilter/ebt_redirect.c b/net/bridge/netfilter/ebt_redirect.c
index bfb9f74..b8afe85 100644
--- a/net/bridge/netfilter/ebt_redirect.c
+++ b/net/bridge/netfilter/ebt_redirect.c
@@ -22,7 +22,7 @@ static int ebt_target_redirect(struct sk_buff *skb, unsigned int hooknr,
const struct ebt_redirect_info *info = data;
if (!skb_make_writable(skb, 0))
- return NF_DROP;
+ return EBT_DROP;
if (hooknr != NF_BR_BROUTING)
memcpy(eth_hdr(skb)->h_dest,
diff --git a/net/bridge/netfilter/ebt_snat.c b/net/bridge/netfilter/ebt_snat.c
index 204f996..5425333 100644
--- a/net/bridge/netfilter/ebt_snat.c
+++ b/net/bridge/netfilter/ebt_snat.c
@@ -23,7 +23,7 @@ static int ebt_target_snat(struct sk_buff *skb, unsigned int hooknr,
const struct ebt_nat_info *info = data;
if (!skb_make_writable(skb, 0))
- return NF_DROP;
+ return EBT_DROP;
memcpy(eth_hdr(skb)->h_source, info->mac, ETH_ALEN);
if (!(info->target & NAT_ARP_BIT) &&
--
1.5.3.rc5
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] [NETFILTER]: fix ebtable targets return
2008-02-21 5:36 [PATCH] [NETFILTER]: fix ebtable targets return Joonwoo Park
@ 2008-02-21 5:45 ` David Miller
2008-02-21 10:50 ` Patrick McHardy
0 siblings, 1 reply; 4+ messages in thread
From: David Miller @ 2008-02-21 5:45 UTC (permalink / raw)
To: joonwpark81; +Cc: kaber, netfilter-devel, netdev
From: Joonwoo Park <joonwpark81@gmail.com>
Date: Thu, 21 Feb 2008 14:36:32 +0900
> The function ebt_do_table doesn't take NF_DROP as a verdict from the targets.
>
> Signed-off-by: Joonwoo Park <joonwpark81@gmail.com>
Whoops, good catch :-)
Patrick, if you want you can just signoff on this and I can
put it directly into my tree.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] [NETFILTER]: fix ebtable targets return
2008-02-21 5:45 ` David Miller
@ 2008-02-21 10:50 ` Patrick McHardy
2008-02-24 4:22 ` David Miller
0 siblings, 1 reply; 4+ messages in thread
From: Patrick McHardy @ 2008-02-21 10:50 UTC (permalink / raw)
To: David Miller; +Cc: joonwpark81, netfilter-devel, netdev
David Miller wrote:
> From: Joonwoo Park <joonwpark81@gmail.com>
> Date: Thu, 21 Feb 2008 14:36:32 +0900
>
>> The function ebt_do_table doesn't take NF_DROP as a verdict from the targets.
>>
>> Signed-off-by: Joonwoo Park <joonwpark81@gmail.com>
>
> Whoops, good catch :-)
>
> Patrick, if you want you can just signoff on this and I can
> put it directly into my tree.
Good catch indeed, thanks.
Signed-off-by: Patrick McHardy <kaber@trash.net>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] [NETFILTER]: fix ebtable targets return
2008-02-21 10:50 ` Patrick McHardy
@ 2008-02-24 4:22 ` David Miller
0 siblings, 0 replies; 4+ messages in thread
From: David Miller @ 2008-02-24 4:22 UTC (permalink / raw)
To: kaber; +Cc: joonwpark81, netfilter-devel, netdev
From: Patrick McHardy <kaber@trash.net>
Date: Thu, 21 Feb 2008 11:50:07 +0100
> Good catch indeed, thanks.
>
> Signed-off-by: Patrick McHardy <kaber@trash.net>
Applied, thanks.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2008-02-24 4:22 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-02-21 5:36 [PATCH] [NETFILTER]: fix ebtable targets return Joonwoo Park
2008-02-21 5:45 ` David Miller
2008-02-21 10:50 ` Patrick McHardy
2008-02-24 4:22 ` David Miller
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).