linux.git/net/netfilter, branch v3.8-rc5

netfilter: xt_recent: avoid high order page allocations

2013-01-04T19:14:42+00:00

xt_recent can try high order page allocations and this can fail.

iptables: page allocation failure: order:9, mode:0xc0d0

It also wastes about half the allocated space because of kmalloc()
power-of-two roundups and struct recent_table layout.

Use vmalloc() instead to save space and be less prone to allocation
errors when memory is fragmented.

Reported-by: Miroslav Kratochvil 
Reported-by: Dave Jones 
Reported-by: Harald Reindl 
Signed-off-by: Eric Dumazet 
Signed-off-by: Pablo Neira Ayuso

netfilter: fix missing dependencies for the NOTRACK target

2013-01-04T19:14:38+00:00

warning: (NETFILTER_XT_TARGET_NOTRACK) selects NETFILTER_XT_TARGET_CT which has unmet direct
+dependencies (NET && INET && NETFILTER && NETFILTER_XTABLES && NF_CONNTRACK && (IP_NF_RAW ||
+IP6_NF_RAW) && NETFILTER_ADVANCED)

Reported-by: Randy Dunlap 
Reported-by: kbuild test robot 
Acked-by: Randy Dunlap 
Signed-off-by: Pablo Neira Ayuso

netfilter: ctnetlink: fix leak in error path of ctnetlink_create_expect

2012-12-26T22:02:09+00:00

This patch fixes a leak in one of the error paths of
ctnetlink_create_expect if no helper and no timeout is specified.

Signed-off-by: Jesper Juhl 
Signed-off-by: Pablo Neira Ayuso

netfilter: xt_hashlimit: fix namespace destroy path

2012-12-26T17:14:48+00:00

recent_net_exit() is called before recent_mt_destroy() in the
destroy path of network namespaces. Make sure there are no entries
in the parent proc entry xt_recent before removing it.

Signed-off-by: Vitaly E. Lavrov 
Signed-off-by: Pablo Neira Ayuso

netfilter: xt_recent: fix namespace destroy path

2012-12-26T17:14:48+00:00

recent_net_exit() is called before recent_mt_destroy() in the
destroy path of network namespaces. Make sure there are no entries
in the parent proc entry xt_recent before removing it.

Signed-off-by: Vitaly E. Lavrov 
Signed-off-by: Pablo Neira Ayuso

netfilter: xt_hashlimit: fix race that results in duplicated entries

2012-12-26T17:14:44+00:00

Two packets may race to create the same entry in the hashtable,
double check if this packet lost race. This double checking only
happens in the path of the packet that creates the hashtable for
first time.

Note that, with this patch, no packet drops occur if the race happens.

Reported-by: Feng Gao 
Signed-off-by: Pablo Neira Ayuso

netfilter: xt_CT: recover NOTRACK target support

2012-12-24T11:55:09+00:00

Florian Westphal reported that the removal of the NOTRACK target
(9655050 netfilter: remove xt_NOTRACK) is breaking some existing
setups.

That removal was scheduled for removal since long time ago as
described in Documentation/feature-removal-schedule.txt

What:  xt_NOTRACK
Files: net/netfilter/xt_NOTRACK.c
When:  April 2011
Why:   Superseded by xt_CT

Still, people may have not notice / may have decided to stick to an
old iptables version. I agree with him in that some more conservative
approach by spotting some printk to warn users for some time is less
agressive.

Current iptables 1.4.16.3 already contains the aliasing support
that makes it point to the CT target, so upgrading would fix it.
Still, the policy so far has been to avoid pushing our users to
upgrade.

As a solution, this patch recovers the NOTRACK target inside the CT
target and it now spots a warning.

Reported-by: Florian Westphal 
Signed-off-by: Pablo Neira Ayuso

netfilter: nfnetlink_log: fix possible compilation issue due to missing include

2012-12-17T00:16:17+00:00

In (0c36b48 netfilter: nfnetlink_log: fix mac address for 6in4 tunnels)
the include file that defines ARPD_SIT was missing. This passed unnoticed
during my tests (I did not hit this problem here).

net/netfilter/nfnetlink_log.c: In function '__build_packet_message':
net/netfilter/nfnetlink_log.c:494:25: error: 'ARPHRD_SIT' undeclared (first use in this function)
net/netfilter/nfnetlink_log.c:494:25: note: each undeclared identifier is reported only once for
+each function it appears in

Reported-by: kbuild test robot 
Signed-off-by: Pablo Neira Ayuso

netfilter: xt_CT: fix crash while destroy ct templates

2012-12-16T22:44:12+00:00

In (d871bef netfilter: ctnetlink: dump entries from the dying and
unconfirmed lists), we assume that all conntrack objects are
inserted in any of the existing lists. However, template conntrack
objects were not. This results in hitting BUG_ON in the
destroy_conntrack path while removing a rule that uses the CT target.

This patch fixes the situation by adding the template lists, which
is where template conntrack objects reside now.

Signed-off-by: Pablo Neira Ayuso

netfilter: nfnetlink_log: fix mac address for 6in4 tunnels

2012-12-16T22:41:31+00:00

For tunnelled ipv6in4 packets, the LOG target (xt_LOG.c) adjusts
the start of the mac field to start at the ethernet header instead
of the ipv4 header for the tunnel. This patch conforms what is
passed by the NFLOG target through nfnetlink to what the LOG target
does. Code borrowed from xt_LOG.c.

Signed-off-by: Bob Hockney 
Signed-off-by: Pablo Neira Ayuso