lkml.org 
[lkml]   [2011]   [Jul]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH] [59/99] netfilter: IPv6: fix DSCP mangle code
    Date
    2.6.35-longterm review patch.  If anyone has any objections, please let me know.

    ------------------
    From: Fernando Luis Vazquez Cao <fernando@oss.ntt.co.jp>

    commit 1ed2f73d90fb49bcf5704aee7e9084adb882bfc5 upstream.

    The mask indicates the bits one wants to zero out, so it needs to be
    inverted before applying to the original TOS field.

    Signed-off-by: Fernando Luis Vazquez Cao <fernando@oss.ntt.co.jp>
    Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    Signed-off-by: Andi Kleen <ak@linux.intel.com>

    ---
    net/netfilter/xt_DSCP.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    Index: linux-2.6.35.y/net/netfilter/xt_DSCP.c
    ===================================================================
    --- linux-2.6.35.y.orig/net/netfilter/xt_DSCP.c
    +++ linux-2.6.35.y/net/netfilter/xt_DSCP.c
    @@ -99,7 +99,7 @@ tos_tg6(struct sk_buff *skb, const struc
    u_int8_t orig, nv;

    orig = ipv6_get_dsfield(iph);
    - nv = (orig & info->tos_mask) ^ info->tos_value;
    + nv = (orig & ~info->tos_mask) ^ info->tos_value;

    if (orig != nv) {
    if (!skb_make_writable(skb, sizeof(struct iphdr)))

    \
     
     \ /
      Last update: 2011-07-28 00:03    [W:4.274 / U:0.320 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site