netfilter-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: pablo@netfilter.org
To: stable@kernel.org
Cc: netfilter-devel@vger.kernel.org,
	Fernando Luis Vazquez Cao <fernando@oss.ntt.co.jp>,
	Pablo Neira Ayuso <pablo@netfilter.org>
Subject: [PATCH 2/2] netfilter: IPv6: fix DSCP mangle code
Date: Mon,  6 Jun 2011 02:41:11 +0200	[thread overview]
Message-ID: <1307320871-31770-2-git-send-email-pablo@netfilter.org> (raw)
In-Reply-To: <1307320871-31770-1-git-send-email-pablo@netfilter.org>

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

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

The following Linux kernels are affected: <= 2.6.38.8

Cc: stable@kernel.org
Signed-off-by: Fernando Luis Vazquez Cao <fernando@oss.ntt.co.jp>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
(cherry picked from commit 1ed2f73d90fb49bcf5704aee7e9084adb882bfc5)
---
 net/netfilter/xt_DSCP.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/net/netfilter/xt_DSCP.c b/net/netfilter/xt_DSCP.c
index 0a22919..ae82716 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_action_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.2.5


  reply	other threads:[~2011-06-06  0:41 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-06-06  0:41 [PATCH 1/2] netfilter: IPv6: initialize TOS field in REJECT target module pablo
2011-06-06  0:41 ` pablo [this message]
2011-06-06 13:44   ` [PATCH 2/2] netfilter: IPv6: fix DSCP mangle code Maciej Żenczykowski
2011-06-06 14:41     ` Jan Engelhardt
2011-06-16  8:36       ` [PATCH] iptables: document IPv6 TOS mangling bug in old Linux kernels Fernando Luis Vazquez Cao
2011-06-16 15:06         ` Jan Engelhardt
2011-06-16 15:15           ` Patrick McHardy
2011-06-17  1:11             ` Fernando Luis Vázquez Cao
2011-06-17  1:14               ` Fernando Luis Vázquez Cao
2011-06-17  3:47                 ` Patrick McHardy
2011-08-02  1:00                   ` [PATCH] iptables/man: IPv6 TOS mangling fix was backported to 2.6.35-longterm too Fernando Luis Vázquez Cao
2011-08-24  2:55                     ` Fernando Luis Vazquez Cao
2011-08-26 13:16                       ` Jan Engelhardt
2011-06-07  1:58     ` [PATCH 2/2] netfilter: IPv6: fix DSCP mangle code Fernando Luis Vázquez Cao
2011-06-07  4:15       ` Maciej Żenczykowski
2011-06-07  4:51         ` Fernando Luis Vázquez Cao
2011-06-07  4:55           ` Fernando Luis Vázquez Cao
2011-06-07  6:03             ` Maciej Żenczykowski
2011-06-06 17:36 ` [stable] [PATCH 1/2] netfilter: IPv6: initialize TOS field in REJECT target module Greg KH
2011-06-07  2:39   ` Fernando Luis Vázquez Cao
2011-06-15  0:11     ` Greg KH
2011-06-15  6:19       ` Fernando Luis Vázquez Cao
2011-06-15 19:25         ` Greg KH

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1307320871-31770-2-git-send-email-pablo@netfilter.org \
    --to=pablo@netfilter.org \
    --cc=fernando@oss.ntt.co.jp \
    --cc=netfilter-devel@vger.kernel.org \
    --cc=stable@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).