linux-stable.git/net/ipv6/netfilter, branch linux-3.6.y

netfilter: nf_conntrack: generalize nf_ct_l4proto_net

2012-07-04T17:37:22+00:00

This patch generalizes nf_ct_l4proto_net by splitting it into chunks and
moving the corresponding protocol part to where it really belongs to.

To clarify, note that we follow two different approaches to support per-net
depending if it's built-in or run-time loadable protocol tracker.

Signed-off-by: Pablo Neira Ayuso 
Acked-by: Gao feng

netfilter: nf_ct_icmpv6: add icmpv6_kmemdup_sysctl_table function

2012-06-27T17:16:31+00:00

Split sysctl function into smaller chucks to cleanup code and prepare
patches to reduce ifdef pollution.

Signed-off-by: Gao feng 
Signed-off-by: Pablo Neira Ayuso

netfilter: nf_conntrack: prepare l4proto->init_net cleanup

2012-06-27T16:31:14+00:00

l4proto->init contain quite redundant code. We can simplify this
by adding a new parameter l3proto.

This patch prepares that code simplification.

Signed-off-by: Gao feng 
Signed-off-by: Pablo Neira Ayuso

netfilter: add user-space connection tracking helper infrastructure

2012-06-16T13:40:02+00:00

There are good reasons to supports helpers in user-space instead:

* Rapid connection tracking helper development, as developing code
  in user-space is usually faster.

* Reliability: A buggy helper does not crash the kernel. Moreover,
  we can monitor the helper process and restart it in case of problems.

* Security: Avoid complex string matching and mangling in kernel-space
  running in privileged mode. Going further, we can even think about
  running user-space helpers as a non-root process.

* Extensibility: It allows the development of very specific helpers (most
  likely non-standard proprietary protocols) that are very likely not to be
  accepted for mainline inclusion in the form of kernel-space connection
  tracking helpers.

This patch adds the infrastructure to allow the implementation of
user-space conntrack helpers by means of the new nfnetlink subsystem
`nfnetlink_cthelper' and the existing queueing infrastructure
(nfnetlink_queue).

I had to add the new hook NF_IP6_PRI_CONNTRACK_HELPER to register
ipv[4|6]_helper which results from splitting ipv[4|6]_confirm into
two pieces. This change is required not to break NAT sequence
adjustment and conntrack confirmation for traffic that is enqueued
to our user-space conntrack helpers.

Basic operation, in a few steps:

1) Register user-space helper by means of `nfct':

 nfct helper add ftp inet tcp

 [ It must be a valid existing helper supported by conntrack-tools ]

2) Add rules to enable the FTP user-space helper which is
   used to track traffic going to TCP port 21.

For locally generated packets:

 iptables -I OUTPUT -t raw -p tcp --dport 21 -j CT --helper ftp

For non-locally generated packets:

 iptables -I PREROUTING -t raw -p tcp --dport 21 -j CT --helper ftp

3) Run the test conntrackd in helper mode (see example files under
   doc/helper/conntrackd.conf

 conntrackd

4) Generate FTP traffic going, if everything is OK, then conntrackd
   should create expectations (you can check that with `conntrack':

 conntrack -E expect

    [NEW] 301 proto=6 src=192.168.1.136 dst=130.89.148.12 sport=0 dport=54037 mask-src=255.255.255.255 mask-dst=255.255.255.255 sport=0 dport=65535 master-src=192.168.1.136 master-dst=130.89.148.12 sport=57127 dport=21 class=0 helper=ftp
[DESTROY] 301 proto=6 src=192.168.1.136 dst=130.89.148.12 sport=0 dport=54037 mask-src=255.255.255.255 mask-dst=255.255.255.255 sport=0 dport=65535 master-src=192.168.1.136 master-dst=130.89.148.12 sport=57127 dport=21 class=0 helper=ftp

This confirms that our test helper is receiving packets including the
conntrack information, and adding expectations in kernel-space.

The user-space helper can also store its private tracking information
in the conntrack structure in the kernel via the CTA_HELP_INFO. The
kernel will consider this a binary blob whose layout is unknown. This
information will be included in the information that is transfered
to user-space via glue code that integrates nfnetlink_queue and
ctnetlink.

Signed-off-by: Pablo Neira Ayuso

netfilter: nf_conntrack: add namespace support for cttimeout

2012-06-07T12:58:41+00:00

This patch adds namespace support for cttimeout.

Acked-by: Eric W. Biederman 
Signed-off-by: Gao feng 
Signed-off-by: Pablo Neira Ayuso

netfilter: nf_conntrack: remove now unused sysctl for nf_conntrack_l[3|4]proto

2012-06-07T12:58:41+00:00

Since the sysctl data for l[3|4]proto now resides in pernet nf_proto_net.
We can now remove this unused fields from struct nf_contrack_l[3,4]proto.

Acked-by: Eric W. Biederman 
Signed-off-by: Gao feng 
Signed-off-by: Pablo Neira Ayuso

netfilter: nf_ct_ipv6: add namespace support

2012-06-07T12:58:40+00:00

This patch adds namespace support for IPv6 protocol tracker.

Acked-by: Eric W. Biederman 
Signed-off-by: Gao feng 
Signed-off-by: Pablo Neira Ayuso

netfilter: nf_ct_icmp: add namespace support

2012-06-07T12:58:40+00:00

This patch adds namespace support for ICMPv6 protocol tracker.

Acked-by: Eric W. Biederman 
Signed-off-by: Gao feng 
Signed-off-by: Pablo Neira Ayuso

netfilter: nf_conntrack: prepare namespace support for l3 protocol trackers

2012-06-07T12:58:39+00:00

This patch prepares the namespace support for layer 3 protocol trackers.
Basically, this modifies the following interfaces:

* nf_ct_l3proto_[un]register_sysctl.
* nf_conntrack_l3proto_[un]register.

We add a new nf_ct_l3proto_net is used to get the pernet data of l3proto.

This adds rhe new struct nf_ip_net that is used to store the sysctl header
and l3proto_ipv4,l4proto_tcp(6),l4proto_udp(6),l4proto_icmp(v6) because the
protos such tcp and tcp6 use the same data,so making nf_ip_net as a field
of netns_ct is the easiest way to manager it.

This patch also adds init_net to struct nf_conntrack_l3proto to initial
the layer 3 protocol pernet data.

Acked-by: Eric W. Biederman 
Signed-off-by: Gao feng 
Signed-off-by: Pablo Neira Ayuso

netfilter: nf_conntrack: prepare namespace support for l4 protocol trackers

2012-06-07T12:58:39+00:00

This patch prepares the namespace support for layer 4 protocol trackers.
Basically, this modifies the following interfaces:

* nf_ct_[un]register_sysctl
* nf_conntrack_l4proto_[un]register

to include the namespace parameter. We still use init_net in this patch
to prepare the ground for follow-up patches for each layer 4 protocol
tracker.

We add a new net_id field to struct nf_conntrack_l4proto that is used
to store the pernet_operations id for each layer 4 protocol tracker.

Note that AF_INET6's protocols do not need to do sysctl compat. Thus,
we only register compat sysctl when l4proto.l3proto != AF_INET6.

Acked-by: Eric W. Biederman 
Signed-off-by: Gao feng 
Signed-off-by: Pablo Neira Ayuso