Skip to content

Commit

Permalink
ipv6: unify conntrack reassembly expire code with standard one
Browse files Browse the repository at this point in the history 
Two years ago, Shan Wei tried to fix this:
http://patchwork.ozlabs.org/patch/43905/

The problem is that RFC2460 requires an ICMP Time
Exceeded -- Fragment Reassembly Time Exceeded message should be
sent to the source of that fragment, if the defragmentation
times out.

"
   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.
"

As Herbert suggested, we could actually use the standard IPv6
reassembly code which follows RFC2460.

With this patch applied, I can see ICMP Time Exceeded sent
from the receiver when the sender sent out 3/4 fragmented
IPv6 UDP packet.

Cc: Herbert Xu <herbert@gondor.apana.org.au>
Cc: Michal Kubeček <mkubecek@suse.cz>
Cc: David Miller <davem@davemloft.net>
Cc: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>
Cc: Patrick McHardy <kaber@trash.net>
Cc: Pablo Neira Ayuso <pablo@netfilter.org>
Cc: netfilter-devel@vger.kernel.org
Signed-off-by: Cong Wang <amwang@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Amerigo Wang authored and David S. Miller committed Sep 19, 2012
1 parent c038a76 commit b836c99
Show file tree
Hide file tree
Showing 3 changed files with 57 additions and 99 deletions.
19 changes: 19 additions & 0 deletions include/net/ipv6.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -411,6 +411,25 @@ struct ip6_create_arg {
void ip6_frag_init(struct inet_frag_queue *q, void *a);
bool ip6_frag_match(struct inet_frag_queue *q, void *a);

/*
* Equivalent of ipv4 struct ip
*/
struct frag_queue {
struct inet_frag_queue q;

__be32 id; /* fragment id */
u32 user;
struct in6_addr saddr;
struct in6_addr daddr;

int iif;
unsigned int csum;
__u16 nhoffset;
};

void ip6_expire_frag_queue(struct net *net, struct frag_queue *fq,
struct inet_frags *frags);

static inline bool ipv6_addr_any(const struct in6_addr *a)
{
#if defined(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) && BITS_PER_LONG == 64
Expand Down
74 changes: 19 additions & 55 deletions net/ipv6/netfilter/nf_conntrack_reasm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,19 +57,6 @@ struct nf_ct_frag6_skb_cb

#define NFCT_FRAG6_CB(skb) ((struct nf_ct_frag6_skb_cb*)((skb)->cb))

struct nf_ct_frag6_queue
{
struct inet_frag_queue q;

__be32 id; /* fragment id */
u32 user;
struct in6_addr saddr;
struct in6_addr daddr;

unsigned int csum;
__u16 nhoffset;
};

static struct inet_frags nf_frags;

#ifdef CONFIG_SYSCTL
Expand Down Expand Up @@ -151,9 +138,9 @@ static void __net_exit nf_ct_frags6_sysctl_unregister(struct net *net)

static unsigned int nf_hashfn(struct inet_frag_queue *q)
{
const struct nf_ct_frag6_queue *nq;
const struct frag_queue *nq;

nq = container_of(q, struct nf_ct_frag6_queue, q);
nq = container_of(q, struct frag_queue, q);
return inet6_hash_frag(nq->id, &nq->saddr, &nq->daddr, nf_frags.rnd);
}

Expand All @@ -163,44 +150,21 @@ static void nf_skb_free(struct sk_buff *skb)
kfree_skb(NFCT_FRAG6_CB(skb)->orig);
}

/* Destruction primitives. */

static __inline__ void fq_put(struct nf_ct_frag6_queue *fq)
{
inet_frag_put(&fq->q, &nf_frags);
}

/* Kill fq entry. It is not destroyed immediately,
* because caller (and someone more) holds reference count.
*/
static __inline__ void fq_kill(struct nf_ct_frag6_queue *fq)
{
inet_frag_kill(&fq->q, &nf_frags);
}

static void nf_ct_frag6_expire(unsigned long data)
{
struct nf_ct_frag6_queue *fq;

fq = container_of((struct inet_frag_queue *)data,
struct nf_ct_frag6_queue, q);
struct frag_queue *fq;
struct net *net;

spin_lock(&fq->q.lock);
fq = container_of((struct inet_frag_queue *)data, struct frag_queue, q);
net = container_of(fq->q.net, struct net, nf_frag.frags);

if (fq->q.last_in & INET_FRAG_COMPLETE)
goto out;

fq_kill(fq);

out:
spin_unlock(&fq->q.lock);
fq_put(fq);
ip6_expire_frag_queue(net, fq, &nf_frags);
}

/* Creation primitives. */
static inline struct nf_ct_frag6_queue *fq_find(struct net *net, __be32 id,
u32 user, struct in6_addr *src,
struct in6_addr *dst)
static inline struct frag_queue *fq_find(struct net *net, __be32 id,
u32 user, struct in6_addr *src,
struct in6_addr *dst)
{
struct inet_frag_queue *q;
struct ip6_create_arg arg;
Expand All @@ -219,14 +183,14 @@ static inline struct nf_ct_frag6_queue *fq_find(struct net *net, __be32 id,
if (q == NULL)
goto oom;

return container_of(q, struct nf_ct_frag6_queue, q);
return container_of(q, struct frag_queue, q);

oom:
return NULL;
}


static int nf_ct_frag6_queue(struct nf_ct_frag6_queue *fq, struct sk_buff *skb,
static int nf_ct_frag6_queue(struct frag_queue *fq, struct sk_buff *skb,
const struct frag_hdr *fhdr, int nhoff)
{
struct sk_buff *prev, *next;
Expand Down Expand Up @@ -367,7 +331,7 @@ static int nf_ct_frag6_queue(struct nf_ct_frag6_queue *fq, struct sk_buff *skb,
return 0;

discard_fq:
fq_kill(fq);
inet_frag_kill(&fq->q, &nf_frags);
err:
return -1;
}
Expand All @@ -382,12 +346,12 @@ static int nf_ct_frag6_queue(struct nf_ct_frag6_queue *fq, struct sk_buff *skb,
* the last and the first frames arrived and all the bits are here.
*/
static struct sk_buff *
nf_ct_frag6_reasm(struct nf_ct_frag6_queue *fq, struct net_device *dev)
nf_ct_frag6_reasm(struct frag_queue *fq, struct net_device *dev)
{
struct sk_buff *fp, *op, *head = fq->q.fragments;
int payload_len;

fq_kill(fq);
inet_frag_kill(&fq->q, &nf_frags);

WARN_ON(head == NULL);
WARN_ON(NFCT_FRAG6_CB(head)->offset != 0);
Expand Down Expand Up @@ -570,7 +534,7 @@ struct sk_buff *nf_ct_frag6_gather(struct sk_buff *skb, u32 user)
struct net *net = skb_dst(skb) ? dev_net(skb_dst(skb)->dev)
: dev_net(skb->dev);
struct frag_hdr *fhdr;
struct nf_ct_frag6_queue *fq;
struct frag_queue *fq;
struct ipv6hdr *hdr;
int fhoff, nhoff;
u8 prevhdr;
Expand Down Expand Up @@ -619,7 +583,7 @@ struct sk_buff *nf_ct_frag6_gather(struct sk_buff *skb, u32 user)
if (nf_ct_frag6_queue(fq, clone, fhdr, nhoff) < 0) {
spin_unlock_bh(&fq->q.lock);
pr_debug("Can't insert skb to queue\n");
fq_put(fq);
inet_frag_put(&fq->q, &nf_frags);
goto ret_orig;
}

Expand All @@ -631,7 +595,7 @@ struct sk_buff *nf_ct_frag6_gather(struct sk_buff *skb, u32 user)
}
spin_unlock_bh(&fq->q.lock);

fq_put(fq);
inet_frag_put(&fq->q, &nf_frags);
return ret_skb;

ret_orig:
Expand Down Expand Up @@ -695,7 +659,7 @@ int nf_ct_frag6_init(void)
nf_frags.constructor = ip6_frag_init;
nf_frags.destructor = NULL;
nf_frags.skb_free = nf_skb_free;
nf_frags.qsize = sizeof(struct nf_ct_frag6_queue);
nf_frags.qsize = sizeof(struct frag_queue);
nf_frags.match = ip6_frag_match;
nf_frags.frag_expire = nf_ct_frag6_expire;
nf_frags.secret_interval = 10 * 60 * HZ;
Expand Down
63 changes: 19 additions & 44 deletions net/ipv6/reassembly.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,24 +65,6 @@ struct ip6frag_skb_cb
#define FRAG6_CB(skb) ((struct ip6frag_skb_cb*)((skb)->cb))


/*
* Equivalent of ipv4 struct ipq
*/

struct frag_queue
{
struct inet_frag_queue q;

__be32 id; /* fragment id */
u32 user;
struct in6_addr saddr;
struct in6_addr daddr;

int iif;
unsigned int csum;
__u16 nhoffset;
};

static struct inet_frags ip6_frags;

int ip6_frag_nqueues(struct net *net)
Expand Down Expand Up @@ -159,21 +141,6 @@ void ip6_frag_init(struct inet_frag_queue *q, void *a)
}
EXPORT_SYMBOL(ip6_frag_init);

/* Destruction primitives. */

static __inline__ void fq_put(struct frag_queue *fq)
{
inet_frag_put(&fq->q, &ip6_frags);
}

/* Kill fq entry. It is not destroyed immediately,
* because caller (and someone more) holds reference count.
*/
static __inline__ void fq_kill(struct frag_queue *fq)
{
inet_frag_kill(&fq->q, &ip6_frags);
}

static void ip6_evictor(struct net *net, struct inet6_dev *idev)
{
int evicted;
Expand All @@ -183,22 +150,18 @@ static void ip6_evictor(struct net *net, struct inet6_dev *idev)
IP6_ADD_STATS_BH(net, idev, IPSTATS_MIB_REASMFAILS, evicted);
}

static void ip6_frag_expire(unsigned long data)
void ip6_expire_frag_queue(struct net *net, struct frag_queue *fq,
struct inet_frags *frags)
{
struct frag_queue *fq;
struct net_device *dev = NULL;
struct net *net;

fq = container_of((struct inet_frag_queue *)data, struct frag_queue, q);

spin_lock(&fq->q.lock);

if (fq->q.last_in & INET_FRAG_COMPLETE)
goto out;

fq_kill(fq);
inet_frag_kill(&fq->q, frags);

net = container_of(fq->q.net, struct net, ipv6.frags);
rcu_read_lock();
dev = dev_get_by_index_rcu(net, fq->iif);
if (!dev)
Expand All @@ -222,7 +185,19 @@ static void ip6_frag_expire(unsigned long data)
rcu_read_unlock();
out:
spin_unlock(&fq->q.lock);
fq_put(fq);
inet_frag_put(&fq->q, frags);
}
EXPORT_SYMBOL(ip6_expire_frag_queue);

static void ip6_frag_expire(unsigned long data)
{
struct frag_queue *fq;
struct net *net;

fq = container_of((struct inet_frag_queue *)data, struct frag_queue, q);
net = container_of(fq->q.net, struct net, ipv6.frags);

ip6_expire_frag_queue(net, fq, &ip6_frags);
}

static __inline__ struct frag_queue *
Expand Down Expand Up @@ -391,7 +366,7 @@ static int ip6_frag_queue(struct frag_queue *fq, struct sk_buff *skb,
return -1;

discard_fq:
fq_kill(fq);
inet_frag_kill(&fq->q, &ip6_frags);
err:
IP6_INC_STATS(net, ip6_dst_idev(skb_dst(skb)),
IPSTATS_MIB_REASMFAILS);
Expand All @@ -417,7 +392,7 @@ static int ip6_frag_reasm(struct frag_queue *fq, struct sk_buff *prev,
unsigned int nhoff;
int sum_truesize;

fq_kill(fq);
inet_frag_kill(&fq->q, &ip6_frags);

/* Make the one we just received the head. */
if (prev) {
Expand Down Expand Up @@ -586,7 +561,7 @@ static int ipv6_frag_rcv(struct sk_buff *skb)
ret = ip6_frag_queue(fq, skb, fhdr, IP6CB(skb)->nhoff);

spin_unlock(&fq->q.lock);
fq_put(fq);
inet_frag_put(&fq->q, &ip6_frags);
return ret;
}

Expand Down

0 comments on commit b836c99

Please sign in to comment.