| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <4B84C248.4030605@cn.fujitsu.com>
Date: Wed, 24 Feb 2010 14:08:08 +0800
From: Shan Wei <shanwei@...fujitsu.com>
To: Yasuyuki KOZAKAI <yasuyuki.kozakai@...hiba.co.jp>,
Patrick McHardy <kaber@...sh.net>,
David Miller <davem@...emloft.net>
CC: netfilter-devel@...r.kernel.org,
"netdev@...r.kernel.org" <netdev@...r.kernel.org>,
Shan Wei <shanwei@...fujitsu.com>
Subject: [RFC PATCH net-next 2/5]IPv6:netfilter: Send an ICMPv6 "Fragment
Reassembly Timeout" message when enabling connection track
An end host with IPv6 connection track enable should send an
ICMP "Fragment Reassembly Timeout" message when defraging timeout
according to the section 4.5 in RFC2460.
This patch supports it and adds counter value of Ip6ReasmTimeout and Ip6ReasmFails.
Quote Begin:
Section 4.5 in RFC2460.
If insufficient fragments are received to complete reassembly of a
packet within 60 seconds of the reception of the first-arriving
fragment of that packet, reassembly of that packet must be
abandoned and all the fragments that have been received for that
packet must be discarded. If the first fragment (i.e., the one
with a Fragment Offset of zero) has been received, an ICMP Time
Exceeded -- Fragment Reassembly Time Exceeded message should be
sent to the source of that fragment.
Quote End.
Signed-off-by: Shan Wei <shanwei@...fujitsu.com>
---
include/linux/skbuff.h | 5 +++
net/ipv6/netfilter/nf_conntrack_reasm.c | 48 ++++++++++++++++++++++++++++++-
net/ipv6/route.c | 1 +
3 files changed, 53 insertions(+), 1 deletions(-)
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index ba0f8e3..e0b72e4 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -431,6 +431,11 @@ static inline struct rtable *skb_rtable(const struct sk_buff *skb)
return (struct rtable *)skb_dst(skb);
}
+static inline struct rt6_info *skb_r6table(const struct sk_buff *skb)
+{
+ return (struct rt6_info *)skb_dst(skb);
+}
+
extern void kfree_skb(struct sk_buff *skb);
extern void consume_skb(struct sk_buff *skb);
extern void __kfree_skb(struct sk_buff *skb);
diff --git a/net/ipv6/netfilter/nf_conntrack_reasm.c b/net/ipv6/netfilter/nf_conntrack_reasm.c
index b53083f..4a1b5bd 100644
--- a/net/ipv6/netfilter/nf_conntrack_reasm.c
+++ b/net/ipv6/netfilter/nf_conntrack_reasm.c
@@ -27,10 +27,12 @@
#include <linux/ipv6.h>
#include <linux/icmpv6.h>
#include <linux/random.h>
+#include <linux/ipv6_route.h>
#include <net/sock.h>
#include <net/snmp.h>
#include <net/inet_frag.h>
+#include <net/ip6_route.h>
#include <net/ipv6.h>
#include <net/protocol.h>
@@ -64,6 +66,7 @@ struct nf_ct_frag6_queue
struct in6_addr saddr;
struct in6_addr daddr;
+ int iif;
unsigned int csum;
__u16 nhoffset;
};
@@ -118,6 +121,8 @@ static void nf_ct_frag6_evictor(struct net *net)
static void nf_ct_frag6_expire(unsigned long data)
{
struct nf_ct_frag6_queue *fq;
+ struct net_device *dev = NULL;
+ struct net *net;
fq = container_of((struct inet_frag_queue *)data,
struct nf_ct_frag6_queue, q);
@@ -128,7 +133,44 @@ static void nf_ct_frag6_expire(unsigned long data)
goto out;
fq_kill(fq);
+ net = container_of(fq->q.net, struct net, ipv6.frags);
+ rcu_read_lock();
+ dev = dev_get_by_index_rcu(net, fq->iif);
+ if (!dev)
+ goto out_rcu_unlock;
+
+ IP6_INC_STATS_BH(net, __in6_dev_get(dev), IPSTATS_MIB_REASMTIMEOUT);
+ IP6_INC_STATS_BH(net, __in6_dev_get(dev), IPSTATS_MIB_REASMFAILS);
+
+ /* Don't send error if the first segment did not arrive. */
+ if (!(fq->q.last_in & INET_FRAG_FIRST_IN) || !fq->q.fragments)
+ goto out_rcu_unlock;
+
+ /*
+ * Only search router table for the head fragment,
+ * when defraging timeout at PRE_ROUTING HOOK.
+ */
+ if (fq->user == IP6_DEFRAG_CONNTRACK_IN) {
+ struct sk_buff *head = fq->q.fragments;
+
+ head->dev = dev;
+ ip6_route_input(head);
+ if (!skb_dst(head))
+ goto out_rcu_unlock;
+
+ /*
+ * Only an end host needs to send an ICMP "Fragment Reassembly
+ * Timeout" message, per section 4.5 of RFC2460.
+ */
+ if (!(skb_r6table(head)->rt6i_flags & RTF_LOCAL))
+ goto out_rcu_unlock;
+ /* Send an ICMP "Fragment Reassembly Timeout" message. */
+ icmpv6_send(head, ICMPV6_TIME_EXCEED, ICMPV6_EXC_FRAGTIME, 0);
+ }
+
+out_rcu_unlock:
+ rcu_read_unlock();
out:
spin_unlock(&fq->q.lock);
fq_put(fq);
@@ -318,7 +360,11 @@ static int nf_ct_frag6_queue(struct nf_ct_frag6_queue *fq, struct sk_buff *skb,
else
fq->q.fragments = skb;
- skb->dev = NULL;
+ if (skb->dev) {
+ fq->iif = skb->dev->ifindex;
+ skb->dev = NULL;
+ }
+
fq->q.stamp = skb->tstamp;
fq->q.meat += skb->len;
atomic_add(skb->truesize, &fq->q.net->mem);
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 88c0a5c..ef4bdd9 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -802,6 +802,7 @@ void ip6_route_input(struct sk_buff *skb)
skb_dst_set(skb, fib6_rule_lookup(net, &fl, flags, ip6_pol_route_input));
}
+EXPORT_SYMBOL(ip6_route_input);
static struct rt6_info *ip6_pol_route_output(struct net *net, struct fib6_table *table,
struct flowi *fl, int flags)
--
1.6.3.3
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists