lkml.org 
[lkml]   [2012]   [May]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[34-longterm 071/179] netfilter: IPv6: fix DSCP mangle code
    Date
    From: Fernando Luis Vazquez Cao <fernando@oss.ntt.co.jp>

    -------------------
    This is a commit scheduled for the next v2.6.34 longterm release.
    http://git.kernel.org/?p=linux/kernel/git/paulg/longterm-queue-2.6.34.git
    If you see a problem with using this for longterm, please comment.
    -------------------

    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: Paul Gortmaker <paul.gortmaker@windriver.com>
    ---
    net/netfilter/xt_DSCP.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/net/netfilter/xt_DSCP.c b/net/netfilter/xt_DSCP.c
    index 74ce892..5ec6374 100644
    --- a/net/netfilter/xt_DSCP.c
    +++ b/net/netfilter/xt_DSCP.c
    @@ -99,7 +99,7 @@ tos_tg6(struct sk_buff *skb, const struct xt_target_param *par)
    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)))
    --
    1.7.9.6


    \
     
     \ /
      Last update: 2012-05-15 08:41    [W:0.025 / U:92.660 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site