Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fd685657 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 batch contains netfilter updates for your net-next tree:

1) Expose NFT_OSF_MAXGENRELEN maximum OS name length from the new OS
   passive fingerprint matching extension, from Fernando Fernandez.

2) Add extension to support for fine grain conntrack timeout policies
   from nf_tables. As preparation works, this patchset moves
   nf_ct_untimeout() to nf_conntrack_timeout and it also decouples the
   timeout policy from the ctnl_timeout object, most work done by
   Harsha Sharma.

3) Enable connection tracking when conntrack helper is in place.

4) Missing enumeration in uapi header when splitting original xt_osf
   to nfnetlink_osf, also from Fernando.

5) Fix a sparse warning due to incorrect typing in the nf_osf_find(),
   from Wei Yongjun.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents ebddd97a e7ea2a52

include/linux/netfilter/nfnetlink_osf.h

+0 −12
Original line number Diff line number Diff line
@@ -4,18 +4,6 @@ 


#include <uapi/linux/netfilter/nfnetlink_osf.h>



/* Initial window size option state machine: multiple of mss, mtu or

 * plain numeric value. Can also be made as plain numeric value which

 * is not a multiple of specified value.

 */

enum nf_osf_window_size_options {

	OSF_WSS_PLAIN   = 0,

	OSF_WSS_MSS,

	OSF_WSS_MTU,

	OSF_WSS_MODULO,

	OSF_WSS_MAX,

};



enum osf_fmatch_states {

	/* Packet does not match the fingerprint */

	FMATCH_WRONG = 0,

include/net/netfilter/nf_conntrack_l4proto.h

+0 −2
Original line number Diff line number Diff line
@@ -77,7 +77,6 @@ struct nf_conntrack_l4proto { 
			       struct nf_conntrack_tuple *t);

	const struct nla_policy *nla_policy;



#if IS_ENABLED(CONFIG_NF_CT_NETLINK_TIMEOUT)

	struct {

		int (*nlattr_to_obj)(struct nlattr *tb[],

				     struct net *net, void *data);
@@ -87,7 +86,6 @@ struct nf_conntrack_l4proto { 
		u16 nlattr_max;

		const struct nla_policy *nla_policy;

	} ctnl_timeout;

#endif

#ifdef CONFIG_NF_CONNTRACK_PROCFS

	/* Print out the private part of the conntrack. */

	void (*print_conntrack)(struct seq_file *s, struct nf_conn *);

include/net/netfilter/nf_conntrack_timeout.h

+13 −8
Original line number Diff line number Diff line
@@ -11,24 +11,28 @@ 


#define CTNL_TIMEOUT_NAME_MAX	32



struct nf_ct_timeout {

	__u16			l3num;

	const struct nf_conntrack_l4proto *l4proto;

	char			data[0];

};



struct ctnl_timeout {

	struct list_head	head;

	struct rcu_head		rcu_head;

	refcount_t		refcnt;

	char			name[CTNL_TIMEOUT_NAME_MAX];

	__u16			l3num;

	const struct nf_conntrack_l4proto *l4proto;

	char			data[0];

	struct nf_ct_timeout	timeout;

};



struct nf_conn_timeout {

	struct ctnl_timeout __rcu *timeout;

	struct nf_ct_timeout __rcu *timeout;

};



static inline unsigned int *

nf_ct_timeout_data(struct nf_conn_timeout *t)

{

	struct ctnl_timeout *timeout;

	struct nf_ct_timeout *timeout;



	timeout = rcu_dereference(t->timeout);

	if (timeout == NULL)
@@ -49,7 +53,7 @@ struct nf_conn_timeout *nf_ct_timeout_find(const struct nf_conn *ct) 


static inline

struct nf_conn_timeout *nf_ct_timeout_ext_add(struct nf_conn *ct,

					      struct ctnl_timeout *timeout,

					      struct nf_ct_timeout *timeout,

					      gfp_t gfp)

{

#ifdef CONFIG_NF_CONNTRACK_TIMEOUT
@@ -83,6 +87,7 @@ static inline unsigned int *nf_ct_timeout_lookup(const struct nf_conn *ct) 
#ifdef CONFIG_NF_CONNTRACK_TIMEOUT

int nf_conntrack_timeout_init(void);

void nf_conntrack_timeout_fini(void);

void nf_ct_untimeout(struct net *net, struct nf_ct_timeout *timeout);

#else

static inline int nf_conntrack_timeout_init(void)

{
@@ -96,8 +101,8 @@ static inline void nf_conntrack_timeout_fini(void) 
#endif /* CONFIG_NF_CONNTRACK_TIMEOUT */



#ifdef CONFIG_NF_CONNTRACK_TIMEOUT

extern struct ctnl_timeout *(*nf_ct_timeout_find_get_hook)(struct net *net, const char *name);

extern void (*nf_ct_timeout_put_hook)(struct ctnl_timeout *timeout);

extern struct nf_ct_timeout *(*nf_ct_timeout_find_get_hook)(struct net *net, const char *name);

extern void (*nf_ct_timeout_put_hook)(struct nf_ct_timeout *timeout);

#endif



#endif /* _NF_CONNTRACK_TIMEOUT_H */

include/uapi/linux/netfilter/nf_tables.h

+14 −1
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
#define NFT_SET_MAXNAMELEN	NFT_NAME_MAXLEN

#define NFT_OBJ_MAXNAMELEN	NFT_NAME_MAXLEN

#define NFT_USERDATA_MAXLEN	256

#define NFT_OSF_MAXGENRELEN	16



/**

 * enum nft_registers - nf_tables registers
@@ -957,6 +958,7 @@ enum nft_socket_keys { 
 * @NFT_CT_DST_IP: conntrack layer 3 protocol destination (IPv4 address)

 * @NFT_CT_SRC_IP6: conntrack layer 3 protocol source (IPv6 address)

 * @NFT_CT_DST_IP6: conntrack layer 3 protocol destination (IPv6 address)

 * @NFT_CT_TIMEOUT: connection tracking timeout policy assigned to conntrack

 */

enum nft_ct_keys {

	NFT_CT_STATE,
@@ -982,6 +984,7 @@ enum nft_ct_keys { 
	NFT_CT_DST_IP,

	NFT_CT_SRC_IP6,

	NFT_CT_DST_IP6,

	NFT_CT_TIMEOUT,

	__NFT_CT_MAX

};

#define NFT_CT_MAX		(__NFT_CT_MAX - 1)
@@ -1410,6 +1413,15 @@ enum nft_ct_helper_attributes { 
};

#define NFTA_CT_HELPER_MAX	(__NFTA_CT_HELPER_MAX - 1)



enum nft_ct_timeout_timeout_attributes {

	NFTA_CT_TIMEOUT_UNSPEC,

	NFTA_CT_TIMEOUT_L3PROTO,

	NFTA_CT_TIMEOUT_L4PROTO,

	NFTA_CT_TIMEOUT_DATA,

	__NFTA_CT_TIMEOUT_MAX,

};

#define NFTA_CT_TIMEOUT_MAX	(__NFTA_CT_TIMEOUT_MAX - 1)



#define NFT_OBJECT_UNSPEC	0

#define NFT_OBJECT_COUNTER	1

#define NFT_OBJECT_QUOTA	2
@@ -1417,7 +1429,8 @@ enum nft_ct_helper_attributes { 
#define NFT_OBJECT_LIMIT	4

#define NFT_OBJECT_CONNLIMIT	5

#define NFT_OBJECT_TUNNEL	6

#define __NFT_OBJECT_MAX	7

#define NFT_OBJECT_CT_TIMEOUT	7

#define __NFT_OBJECT_MAX	8

#define NFT_OBJECT_MAX		(__NFT_OBJECT_MAX - 1)



/**

include/uapi/linux/netfilter/nfnetlink_osf.h

+12 −0
Original line number Diff line number Diff line
@@ -88,6 +88,18 @@ enum iana_options { 
	OSFOPT_EMPTY = 255,

};



/* Initial window size option state machine: multiple of mss, mtu or

 * plain numeric value. Can also be made as plain numeric value which

 * is not a multiple of specified value.

 */

enum nf_osf_window_size_options {

	OSF_WSS_PLAIN	= 0,

	OSF_WSS_MSS,

	OSF_WSS_MTU,

	OSF_WSS_MODULO,

	OSF_WSS_MAX,

};



enum nf_osf_attr_type {

	OSF_ATTR_UNSPEC,

	OSF_ATTR_FINGER,