Commit 9b59377b authored by David S. Miller's avatar David S. Miller
Browse files

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



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: default avatarDavid S. Miller <davem@davemloft.net>
parents 7d397214 48f66c90

include/linux/netfilter/nfnetlink.h

+6 −6
Original line number Diff line number Diff line
@@ -8,10 +8,10 @@ 
#include <uapi/linux/netfilter/nfnetlink.h>



struct nfnl_callback {

	int (*call)(struct sock *nl, struct sk_buff *skb, 

	int (*call)(struct net *net, struct sock *nl, struct sk_buff *skb,

		    const struct nlmsghdr *nlh,

		    const struct nlattr * const cda[]);

	int (*call_rcu)(struct sock *nl, struct sk_buff *skb, 

	int (*call_rcu)(struct net *net, struct sock *nl, struct sk_buff *skb,

			const struct nlmsghdr *nlh,

			const struct nlattr * const cda[]);

	int (*call_batch)(struct net *net, struct sock *nl, struct sk_buff *skb,
@@ -26,8 +26,8 @@ struct nfnetlink_subsystem { 
	__u8 subsys_id;			/* nfnetlink subsystem ID */

	__u8 cb_count;			/* number of callbacks */

	const struct nfnl_callback *cb;	/* callback for individual types */

	int (*commit)(struct sk_buff *skb);

	int (*abort)(struct sk_buff *skb);

	int (*commit)(struct net *net, struct sk_buff *skb);

	int (*abort)(struct net *net, struct sk_buff *skb);

};



int nfnetlink_subsys_register(const struct nfnetlink_subsystem *n);

include/net/netfilter/nf_dup_netdev.h

0 → 100644
+6 −0
Original line number Diff line number Diff line 
#ifndef _NF_DUP_NETDEV_H_

#define _NF_DUP_NETDEV_H_



void nf_dup_netdev_egress(const struct nft_pktinfo *pkt, int oif);



#endif

include/net/netfilter/nf_tables.h

+6 −5
Original line number Diff line number Diff line
@@ -291,6 +291,8 @@ void nft_unregister_set(struct nft_set_ops *ops); 
 * 	@timeout: default timeout value in msecs

 * 	@gc_int: garbage collection interval in msecs

 *	@policy: set parameterization (see enum nft_set_policies)

 *	@udlen: user data length

 *	@udata: user data

 * 	@ops: set ops

 * 	@pnet: network namespace

 * 	@flags: set flags
@@ -310,6 +312,8 @@ struct nft_set { 
	u64				timeout;

	u32				gc_int;

	u16				policy;

	u16				udlen;

	unsigned char			*udata;

	/* runtime data below here */

	const struct nft_set_ops	*ops ____cacheline_aligned;

	possible_net_t			pnet;
@@ -821,10 +825,7 @@ static inline struct nft_base_chain *nft_base_chain(const struct nft_chain *chai 
	return container_of(chain, struct nft_base_chain, chain);

}



int nft_register_basechain(struct nft_base_chain *basechain,

			   unsigned int hook_nops);

void nft_unregister_basechain(struct nft_base_chain *basechain,

			      unsigned int hook_nops);

int __nft_release_basechain(struct nft_ctx *ctx);



unsigned int nft_do_chain(struct nft_pktinfo *pkt, void *priv);
@@ -880,7 +881,7 @@ struct nft_af_info { 
};



int nft_register_afinfo(struct net *, struct nft_af_info *);

void nft_unregister_afinfo(struct nft_af_info *);

void nft_unregister_afinfo(struct net *, struct nft_af_info *);



int nft_register_chain_type(const struct nf_chain_type *);

void nft_unregister_chain_type(const struct nf_chain_type *);

include/uapi/linux/netfilter/nf_tables.h

+22 −0
Original line number Diff line number Diff line
@@ -291,6 +291,7 @@ enum nft_set_desc_attributes { 
 * @NFTA_SET_ID: uniquely identifies a set in a transaction (NLA_U32)

 * @NFTA_SET_TIMEOUT: default timeout value (NLA_U64)

 * @NFTA_SET_GC_INTERVAL: garbage collection interval (NLA_U32)

 * @NFTA_SET_USERDATA: user data (NLA_BINARY)

 */

enum nft_set_attributes {

	NFTA_SET_UNSPEC,
@@ -306,6 +307,7 @@ enum nft_set_attributes { 
	NFTA_SET_ID,

	NFTA_SET_TIMEOUT,

	NFTA_SET_GC_INTERVAL,

	NFTA_SET_USERDATA,

	__NFTA_SET_MAX

};

#define NFTA_SET_MAX		(__NFTA_SET_MAX - 1)
@@ -755,6 +757,8 @@ enum nft_ct_keys { 
	NFT_CT_PROTO_SRC,

	NFT_CT_PROTO_DST,

	NFT_CT_LABELS,

	NFT_CT_PKTS,

	NFT_CT_BYTES,

};



/**
@@ -780,6 +784,10 @@ enum nft_limit_type { 
	NFT_LIMIT_PKT_BYTES

};



enum nft_limit_flags {

	NFT_LIMIT_F_INV	= (1 << 0),

};



/**

 * enum nft_limit_attributes - nf_tables limit expression netlink attributes

 *
@@ -787,6 +795,7 @@ enum nft_limit_type { 
 * @NFTA_LIMIT_UNIT: refill unit (NLA_U64)

 * @NFTA_LIMIT_BURST: burst (NLA_U32)

 * @NFTA_LIMIT_TYPE: type of limit (NLA_U32: enum nft_limit_type)

 * @NFTA_LIMIT_FLAGS: flags (NLA_U32: enum nft_limit_flags)

 */

enum nft_limit_attributes {

	NFTA_LIMIT_UNSPEC,
@@ -794,6 +803,7 @@ enum nft_limit_attributes { 
	NFTA_LIMIT_UNIT,

	NFTA_LIMIT_BURST,

	NFTA_LIMIT_TYPE,

	NFTA_LIMIT_FLAGS,

	__NFTA_LIMIT_MAX

};

#define NFTA_LIMIT_MAX		(__NFTA_LIMIT_MAX - 1)
@@ -977,6 +987,18 @@ enum nft_dup_attributes { 
};

#define NFTA_DUP_MAX		(__NFTA_DUP_MAX - 1)



/**

 * enum nft_fwd_attributes - nf_tables fwd expression netlink attributes

 *

 * @NFTA_FWD_SREG_DEV: source register of output interface (NLA_U32: nft_register)

 */

enum nft_fwd_attributes {

	NFTA_FWD_UNSPEC,

	NFTA_FWD_SREG_DEV,

	__NFTA_FWD_MAX

};

#define NFTA_FWD_MAX	(__NFTA_FWD_MAX - 1)



/**

 * enum nft_gen_attributes - nf_tables ruleset generation attributes

 *

net/bridge/netfilter/nf_tables_bridge.c

+1 −1
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ err: 


static void nf_tables_bridge_exit_net(struct net *net)

{

	nft_unregister_afinfo(net->nft.bridge);

	nft_unregister_afinfo(net, net->nft.bridge);

	kfree(net->nft.bridge);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE