lkml.org 
[lkml]   [2008]   [Mar]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 40/76] NETFILTER: fix ebtable targets return
    -stable review patch.  If anyone has any objections, please let us know.
    ---------------------

    From: Patrick McHardy <kaber@trash.net>

    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>
    ---

    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(-)

    --- 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_buf
    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;
    --- 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
    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,
    --- 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_buf
    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) &&
    --


    \
     
     \ /
      Last update: 2008-03-22 00:05    [W:4.208 / U:0.352 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site