linux.git/net/netfilter, branch v4.5-rc2

Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next

2016-01-09T01:53:16+00:00

Pablo Neira Ayuso says:

====================
Netfilter updates for net-next

The following patchset contains Netfilter updates for net-next, they are:

1) Release nf_tables objects on netns destructions via
   nft_release_afinfo().

2) Destroy basechain and rules on netdevice removal in the new netdev
   family.

3) Get rid of defensive check against removal of inactive objects in
   nf_tables.

4) Pass down netns pointer to our existing nfnetlink callbacks, as well
   as commit() and abort() nfnetlink callbacks.

5) Allow to invert limit expression in nf_tables, so we can throttle
   overlimit traffic.

6) Add packet duplication for the netdev family.

7) Add forward expression for the netdev family.

8) Define pr_fmt() in conntrack helpers.

9) Don't leave nfqueue configuration on inconsistent state in case of
   errors, from Ken-ichirou MATSUZAWA, follow up patches are also from
   him.

10) Skip queue option handling after unbind.

11) Return error on unknown both in nfqueue and nflog command.

12) Autoload ctnetlink when NFQA_CFG_F_CONNTRACK is set.

13) Add new NFTA_SET_USERDATA attribute to store user data in sets,
    from Carlos Falgueras.

14) Add support for 64 bit byteordering changes nf_tables, from Florian
    Westphal.

15) Add conntrack byte/packet counter matching support to nf_tables,
    also from Florian.
====================

Signed-off-by: David S. Miller

netfilter: nft_ct: add byte/packet counter support

2016-01-08T13:44:09+00:00

If the accounting extension isn't present, we'll return a counter
value of 0.

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

netfilter: nft_byteorder: provide 64bit le/be conversion

2016-01-08T12:32:11+00:00

Needed to convert the (64bit) conntrack counters to BE ordering.

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

netfilter: nf_tables: Add new attributes into nft_set to store user data.

2016-01-08T12:25:08+00:00

User data is stored at after 'nft_set_ops' private data into 'data[]'
flexible array. The field 'udata' points to user data and 'udlen' stores
its length.

Add new flag NFTA_SET_USERDATA.

Signed-off-by: Carlos Falgueras García 
Signed-off-by: Pablo Neira Ayuso

netfilter: nfnetlink_log: just returns error for unknown command

2016-01-08T12:25:07+00:00

This patch stops processing options for unknown command.

Signed-off-by: Ken-ichirou MATSUZAWA 
Signed-off-by: Pablo Neira Ayuso

netfilter: nfnetlink_queue: autoload nf_conntrack_netlink module NFQA_CFG_F_CONNTRACK config flag

2016-01-08T12:25:06+00:00

This patch enables to load nf_conntrack_netlink module if
NFQA_CFG_F_CONNTRACK config flag is specified.

Signed-off-by: Ken-ichirou MATSUZAWA 
Signed-off-by: Pablo Neira Ayuso

netfilter: nfnetlink_queue: just returns error for unknown command

2016-01-08T12:25:05+00:00

This patch stops processing options for unknown command.

Signed-off-by: Ken-ichirou MATSUZAWA 
Signed-off-by: Pablo Neira Ayuso

netfilter: nfnetlink_queue: don't handle options after unbind

2016-01-08T12:25:04+00:00

This patch stops processing after destroying a queue instance.

Signed-off-by: Ken-ichirou MATSUZAWA 
Signed-off-by: Pablo Neira Ayuso

netfilter: nfnetlink_queue: validate dependencies to avoid breaking atomicity

2016-01-08T12:25:03+00:00

Check that dependencies are fulfilled before updating the queue
instance, otherwise we can leave things in intermediate state on errors
in nfqnl_recv_config().

Signed-off-by: Ken-ichirou MATSUZAWA 
Signed-off-by: Pablo Neira Ayuso

netfilter: nf_ct_helper: define pr_fmt()

2016-01-04T16:48:51+00:00

Signed-off-by: Pablo Neira Ayuso