From: Fernando Luis Vazquez Cao Date: Tue, 10 May 2011 08:00:21 +0000 (+0200) Subject: netfilter: IPv6: fix DSCP mangle code X-Git-Tag: v2.6.34.12~111 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f7895de92981a85eb53ab11c65d71e03d1d9c326;p=karo-tx-linux.git netfilter: IPv6: fix DSCP mangle code 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 Signed-off-by: Pablo Neira Ayuso Signed-off-by: Paul Gortmaker --- diff --git a/net/netfilter/xt_DSCP.c b/net/netfilter/xt_DSCP.c index 74ce89260056..5ec637458439 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)))