Skip to contentSkip to conversation

: fix ebtable targets return

PATCH Applied Joonwoo Park 3 participants 4 messages Feb 21, 2008 – Feb 24, 2008

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 : fix ebtable targets return

The function ebt_do_table doesn't take NF_DROP as a verdict from the targets.

---
 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(-)
net/bridge/netfilter/ebt_dnat.c +1 -1
index 1ec671d..ca64c1c 100644
@@ -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;
net/bridge/netfilter/ebt_redirect.c +1 -1
index bfb9f74..b8afe85 100644
@@ -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,
net/bridge/netfilter/ebt_snat.c +1 -1
index 204f996..5425333 100644
@@ -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) &&
Signature · 1 line
1.5.3.rc5
maintainer
#1 lore raw

From: Joonwoo Park <[email protected]>
Date: Thu, 21 Feb 2008 14:36:32 +0900

Quoted 3 lines

The function ebt_do_table doesn't take NF_DROP as a verdict from the targets.

Whoops, good catch :-)

Patrick, if you want you can just signoff on this and I can put it directly into my tree.