linux.git/net/netfilter, branch v3.6-rc1 Linux kernel source tree Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-07-19T18:17:30+00:00 David S. Miller davem@davemloft.net 2012-07-19T18:17:30+00:00 abaa72d7fd9a20a67b62e6afa0e746e27851dc33 Conflicts: drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c 
Conflicts:
	drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
net: Pass optional SKB and SK arguments to dst_ops->{update_pmtu,redirect}() 2012-07-17T10:29:28+00:00 David S. Miller davem@davemloft.net 2012-07-17T10:29:28+00:00 6700c2709c08d74ae2c3c29b84a30da012dbc7f1 This will be used so that we can compose a full flow key. Even though we have a route in this context, we need more. In the future the routes will be without destination address, source address, etc. keying. One ipv4 route will cover entire subnets, etc. In this environment we have to have a way to possess persistent storage for redirects and PMTU information. This persistent storage will exist in the FIB tables, and that's why we'll need to be able to rebuild a full lookup flow key here. Using that flow key will do a fib_lookup() and create/update the persistent entry. Signed-off-by: David S. Miller <davem@davemloft.net> 
This will be used so that we can compose a full flow key.

Even though we have a route in this context, we need more.  In the
future the routes will be without destination address, source address,
etc. keying.  One ipv4 route will cover entire subnets, etc.

In this environment we have to have a way to possess persistent storage
for redirects and PMTU information.  This persistent storage will exist
in the FIB tables, and that's why we'll need to be able to rebuild a
full lookup flow key here.  Using that flow key will do a fib_lookup()
and create/update the persistent entry.

Signed-off-by: David S. Miller <davem@davemloft.net>
ipvs: fix oops in ip_vs_dst_event on rmmod 2012-07-17T10:00:58+00:00 Julian Anastasov ja@ssi.bg 2012-07-07T17:30:11+00:00 283283c4da91adc44b03519f434ee1e7e91d6fdb After commit 39f618b4fd95ae243d940ec64c961009c74e3333 (3.4) "ipvs: reset ipvs pointer in netns" we can oops in ip_vs_dst_event on rmmod ip_vs because ip_vs_control_cleanup is called after the ipvs_core_ops subsys is unregistered and net->ipvs is NULL. Fix it by exiting early from ip_vs_dst_event if ipvs is NULL. It is safe because all services and dests for the net are already freed. Signed-off-by: Julian Anastasov <ja@ssi.bg> Signed-off-by: Simon Horman <horms@verge.net.au> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> 
	After commit 39f618b4fd95ae243d940ec64c961009c74e3333 (3.4)
"ipvs: reset ipvs pointer in netns" we can oops in
ip_vs_dst_event on rmmod ip_vs because ip_vs_control_cleanup
is called after the ipvs_core_ops subsys is unregistered and
net->ipvs is NULL. Fix it by exiting early from ip_vs_dst_event
if ipvs is NULL. It is safe because all services and dests
for the net are already freed.

Signed-off-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-07-11T06:56:33+00:00 David S. Miller davem@davemloft.net 2012-07-11T06:56:33+00:00 04c9f416e371cff076a8b3279fb213628915d059 Conflicts: net/batman-adv/bridge_loop_avoidance.c net/batman-adv/bridge_loop_avoidance.h net/batman-adv/soft-interface.c net/mac80211/mlme.c With merge help from Antonio Quartulli (batman-adv) and Stephen Rothwell (drivers/net/usb/qmi_wwan.c). The net/mac80211/mlme.c conflict seemed easy enough, accounting for a conversion to some new tracing macros. Signed-off-by: David S. Miller <davem@davemloft.net> 
Conflicts:
	net/batman-adv/bridge_loop_avoidance.c
	net/batman-adv/bridge_loop_avoidance.h
	net/batman-adv/soft-interface.c
	net/mac80211/mlme.c

With merge help from Antonio Quartulli (batman-adv) and
Stephen Rothwell (drivers/net/usb/qmi_wwan.c).

The net/mac80211/mlme.c conflict seemed easy enough, accounting for a
conversion to some new tracing macros.

Signed-off-by: David S. Miller <davem@davemloft.net>
net: Fix (nearly-)kernel-doc comments for various functions 2012-07-11T06:13:45+00:00 Ben Hutchings bhutchings@solarflare.com 2012-07-10T10:55:09+00:00 2c53040f018b6c36a46eec75b9b937aaa5f78e6d Fix incorrect start markers, wrapped summary lines, missing section breaks, incorrect separators, and some name mismatches. Signed-off-by: Ben Hutchings <bhutchings@solarflare.com> Signed-off-by: David S. Miller <davem@davemloft.net> 
Fix incorrect start markers, wrapped summary lines, missing section
breaks, incorrect separators, and some name mismatches.

Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
netfilter: ipset: timeout fixing bug broke SET target special timeout value 2012-07-09T08:53:04+00:00 Jozsef Kadlecsik kadlec@blackhole.kfki.hu 2012-06-29T09:42:28+00:00 a73f89a61f92b364f0b4a3be412b5b70553afc23 The patch "127f559 netfilter: ipset: fix timeout value overflow bug" broke the SET target when no timeout was specified. Reported-by: Jean-Philippe Menil <jean-philippe.menil@univ-nantes.fr> Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> 
The patch "127f559 netfilter: ipset: fix timeout value overflow bug"
broke the SET target when no timeout was specified.

Reported-by: Jean-Philippe Menil <jean-philippe.menil@univ-nantes.fr>
Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Merge branch 'master' of git://1984.lsi.us.es/nf-next 2012-07-07T23:18:50+00:00 David S. Miller davem@davemloft.net 2012-07-07T23:18:50+00:00 d3a5ea6e2188adeea028c410c83c90e6b6d9347c 






Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-07-05T10:44:25+00:00

David S. Miller
davem@davemloft.net

2012-07-05T10:44:25+00:00

c90a9bb9073a4096596360f02ea711c619663494












netfilter: nfnetlink_queue: do not allow to set unsupported flag bits
2012-07-04T17:51:50+00:00

Krishna Kumar
krkumar2@in.ibm.com

2012-06-27T00:59:56+00:00

46ba5a25f521e3c50d7bb81b1abb977769047456

Allow setting of only supported flag bits in queue->flags.

Signed-off-by: Krishna Kumar <krkumar2@in.ibm.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>





Allow setting of only supported flag bits in queue->flags.

Signed-off-by: Krishna Kumar <krkumar2@in.ibm.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>







netfilter: nfnetlink: check callbacks before using those in nfnetlink_rcv_msg
2012-07-04T17:47:53+00:00

Tomasz Bursztyka
tomasz.bursztyka@linux.intel.com

2012-06-28T02:57:47+00:00

59560a38a379b6c9048620ee10711d3c0c5974b3

nfnetlink_rcv_msg() might call a NULL callback which will cause NULL pointer
dereference.

Signed-off-by: Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>





nfnetlink_rcv_msg() might call a NULL callback which will cause NULL pointer
dereference.

Signed-off-by: Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>