From: Pablo Neira Ayuso <pablo@netfilter.org>
To: netfilter-devel@vger.kernel.org
Cc: davem@davemloft.net, netdev@vger.kernel.org
Subject: [PATCH 3/7] netfilter: ipset: Skip really non-first fragments for IPv6 when getting port/protocol
Date: Wed, 18 Sep 2013 00:07:30 +0200 [thread overview]
Message-ID: <1379455654-3905-4-git-send-email-pablo@netfilter.org> (raw)
In-Reply-To: <1379455654-3905-1-git-send-email-pablo@netfilter.org>
From: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
---
net/netfilter/ipset/ip_set_getport.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/netfilter/ipset/ip_set_getport.c b/net/netfilter/ipset/ip_set_getport.c
index 6fdf88a..dac156f 100644
--- a/net/netfilter/ipset/ip_set_getport.c
+++ b/net/netfilter/ipset/ip_set_getport.c
@@ -116,12 +116,12 @@ ip_set_get_ip6_port(const struct sk_buff *skb, bool src,
{
int protoff;
u8 nexthdr;
- __be16 frag_off;
+ __be16 frag_off = 0;
nexthdr = ipv6_hdr(skb)->nexthdr;
protoff = ipv6_skip_exthdr(skb, sizeof(struct ipv6hdr), &nexthdr,
&frag_off);
- if (protoff < 0)
+ if (protoff < 0 || (frag_off & htons(~0x7)) != 0)
return false;
return get_port(skb, nexthdr, protoff, src, port, proto);
--
1.7.10.4
next prev parent reply other threads:[~2013-09-17 22:07 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-17 22:07 [PATCH 0/7] netfilter fixes for net Pablo Neira Ayuso
2013-09-17 22:07 ` [PATCH 1/7] netfilter: nf_conntrack: use RCU safe kfree for conntrack extensions Pablo Neira Ayuso
2013-09-17 22:07 ` [PATCH 2/7] netfilter: nf_nat_proto_icmpv6:: fix wrong comparison in icmpv6_manip_pkt Pablo Neira Ayuso
2013-09-17 22:07 ` Pablo Neira Ayuso [this message]
2013-09-17 22:07 ` [PATCH 4/7] netfilter: ipset: Consistent userspace testing with nomatch flag Pablo Neira Ayuso
2013-09-17 22:07 ` [PATCH 5/7] netfilter: ipset: Validate the set family and not the set type family at swapping Pablo Neira Ayuso
2013-09-17 22:07 ` [PATCH 6/7] netfilter: ipset: Fix serious failure in CIDR tracking Pablo Neira Ayuso
2013-09-17 22:07 ` [PATCH 7/7] netfilter: nfnetlink_queue: use network skb for sequence adjustment Pablo Neira Ayuso
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=1379455654-3905-4-git-send-email-pablo@netfilter.org \
--to=pablo@netfilter.org \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
--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).