netfilter: nf_conntrack: add namespace support for cttimeout

This patch adds namespace support for cttimeout.

Acked-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Gao feng <gaofeng@cn.fujitsu.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

1 files changed, 4 insertions, 2 deletions

diff --git a/net/netfilter/nf_conntrack_proto_tcp.c b/net/netfilter/nf_conntrack_proto_tcp.c
index e57f2a888da..1cff854ccb8 100644
--- a/net/netfilter/nf_conntrack_proto_tcp.c
+++ b/net/netfilter/nf_conntrack_proto_tcp.c
@@ -1260,14 +1260,16 @@ static int tcp_nlattr_tuple_size(void)
 #include <linux/netfilter/nfnetlink.h>
 #include <linux/netfilter/nfnetlink_cttimeout.h>
 
-static int tcp_timeout_nlattr_to_obj(struct nlattr *tb[], void *data)
+static int tcp_timeout_nlattr_to_obj(struct nlattr *tb[],
+                                     struct net *net, void *data)
 {
         unsigned int *timeouts = data;
+        struct nf_tcp_net *tn = tcp_pernet(net);
         int i;
 
         /* set default TCP timeouts. */
         for (i=0; i<TCP_CONNTRACK_TIMEOUT_MAX; i++)
-                timeouts[i] = tcp_timeouts[i];
+                timeouts[i] = tn->timeouts[i];
 
         if (tb[CTA_TIMEOUT_TCP_SYN_SENT]) {
                 timeouts[TCP_CONNTRACK_SYN_SENT] =