瀏覽代碼

netns: Fix reassembly timer to use the right namespace

This trivial fix retrieves the network namespace from frag queue
and use it to get the network device in the right namespace.

Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Daniel Lezcano 17 年之前
父節點
當前提交
4ac2ccd016
共有 1 個文件被更改,包括 3 次插入1 次删除
  1. 3 1
      net/ipv6/reassembly.c

+ 3 - 1
net/ipv6/reassembly.c

@@ -197,6 +197,7 @@ static void ip6_frag_expire(unsigned long data)
 {
 {
 	struct frag_queue *fq;
 	struct frag_queue *fq;
 	struct net_device *dev = NULL;
 	struct net_device *dev = NULL;
+	struct net *net;
 
 
 	fq = container_of((struct inet_frag_queue *)data, struct frag_queue, q);
 	fq = container_of((struct inet_frag_queue *)data, struct frag_queue, q);
 
 
@@ -207,7 +208,8 @@ static void ip6_frag_expire(unsigned long data)
 
 
 	fq_kill(fq);
 	fq_kill(fq);
 
 
-	dev = dev_get_by_index(&init_net, fq->iif);
+	net = container_of(fq->q.net, struct net, ipv6.frags);
+	dev = dev_get_by_index(net, fq->iif);
 	if (!dev)
 	if (!dev)
 		goto out;
 		goto out;