NETFILTER: fix ebtable targets return

Upstream commit 1b04ab459:

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

Signed-off-by: Joonwoo Park <joonwpark81@gmail.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/net/bridge/netfilter/ebt_dnat.c b/net/bridge/netfilter/ebt_dnat.c
index 4fa9ecfaceaa27bc1525b4d7dcbaacb8a5293fef..10245116ffde34b598d387c5d3647c15f1326248 100644 (file)
--- 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,
        struct ebt_nat_info *info = (struct ebt_nat_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 e322f10e0e6442171383eee1cb6224280c6f901a..88afc34d1dac6a2bef3a91673324aa3cb8accf05 100644 (file)
--- 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,
        struct ebt_redirect_info *info = (struct ebt_redirect_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 146e889ac68010a6c0d6f3d7182b66aed6ebb879..4c5a5a9ad5acbf4259af0dcc5817c1c640b9ed3f 100644 (file)
--- 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,
        struct ebt_nat_info *info = (struct ebt_nat_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) &&