netfilter-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: pablo@netfilter.org
To: netfilter-devel@vger.kernel.org
Cc: davem@davemloft.net,
	Fernando Luis Vazquez Cao <fernando@oss.ntt.co.jp>,
	Pablo Neira Ayuso <pablo@netfilter.org>
Subject: [PATCH 6/8] netfilter: IPv6: initialize TOS field in REJECT target module
Date: Tue, 10 May 2011 12:05:57 +0200	[thread overview]
Message-ID: <1305021959-2980-7-git-send-email-pablo@netfilter.org> (raw)
In-Reply-To: <1305021959-2980-1-git-send-email-pablo@netfilter.org>

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

The IPv6 header is not zeroed out in alloc_skb so we must initialize
it properly unless we want to see IPv6 packets with random TOS fields
floating around. The current implementation resets the flow label
but this could be changed if deemed necessary.

We stumbled upon this issue when trying to apply a mangle rule to
the RST packet generated by the REJECT target module.

Signed-off-by: Fernando Luis Vazquez Cao <fernando@oss.ntt.co.jp>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
 net/ipv6/netfilter/ip6t_REJECT.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/net/ipv6/netfilter/ip6t_REJECT.c b/net/ipv6/netfilter/ip6t_REJECT.c
index 28e7448..a5a4c5d 100644
--- a/net/ipv6/netfilter/ip6t_REJECT.c
+++ b/net/ipv6/netfilter/ip6t_REJECT.c
@@ -45,6 +45,8 @@ static void send_reset(struct net *net, struct sk_buff *oldskb)
 	int tcphoff, needs_ack;
 	const struct ipv6hdr *oip6h = ipv6_hdr(oldskb);
 	struct ipv6hdr *ip6h;
+#define DEFAULT_TOS_VALUE	0x0U
+	const __u8 tclass = DEFAULT_TOS_VALUE;
 	struct dst_entry *dst = NULL;
 	u8 proto;
 	struct flowi6 fl6;
@@ -124,7 +126,7 @@ static void send_reset(struct net *net, struct sk_buff *oldskb)
 	skb_put(nskb, sizeof(struct ipv6hdr));
 	skb_reset_network_header(nskb);
 	ip6h = ipv6_hdr(nskb);
-	ip6h->version = 6;
+	*(__be32 *)ip6h =  htonl(0x60000000 | (tclass << 20));
 	ip6h->hop_limit = ip6_dst_hoplimit(dst);
 	ip6h->nexthdr = IPPROTO_TCP;
 	ipv6_addr_copy(&ip6h->saddr, &oip6h->daddr);
-- 
1.7.2.3


  parent reply	other threads:[~2011-05-10 10:06 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-05-10 10:05 [PATCH 0/8] netfilter: netfilter fixes for 2.6.39-rc7 pablo
2011-05-10 10:05 ` [PATCH 1/8] netfilter: ctnetlink: fix timestamp support for new conntracks pablo
2011-05-10 10:05 ` [PATCH 2/8] netfilter: fix ebtables compat support pablo
2011-05-15 16:34   ` Pablo Neira Ayuso
2011-05-10 10:05 ` [PATCH 3/8] netfilter: ebtables: only call xt_compat_add_offset once per rule pablo
2011-05-10 10:05 ` [PATCH 4/8] IPVS: Change of socket usage to enable name space exit pablo
2011-05-10 10:05 ` [PATCH 5/8] IPVS: init and cleanup restructuring pablo
2011-05-10 10:05 ` pablo [this message]
2011-05-11  5:12   ` [PATCH 6/8] netfilter: IPv6: initialize TOS field in REJECT target module Fernando Luis Vázquez Cao
2011-05-12  8:23     ` Pablo Neira Ayuso
2011-05-12  8:33       ` Fernando Luis Vázquez Cao
2011-05-10 10:05 ` [PATCH 7/8] netfilter: IPv6: fix DSCP mangle code pablo
2011-05-10 10:05 ` [PATCH 8/8] netfilter: revert a2361c8735e07322023aedc36e4938b35af31eb0 pablo
2011-05-10 10:14   ` Pablo Neira Ayuso
2011-05-10 19:01 ` [PATCH 0/8] netfilter: netfilter fixes for 2.6.39-rc7 David Miller

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=1305021959-2980-7-git-send-email-pablo@netfilter.org \
    --to=pablo@netfilter.org \
    --cc=davem@davemloft.net \
    --cc=fernando@oss.ntt.co.jp \
    --cc=netfilter-devel@vger.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).