Netfilter/IPVS updates for net-next
Subsystems (5)
Pablo Neira Ayuso
maintainercover Netfilter/IPVS updates for net-next
Hi,
The following patchset contains Netfilter/IPVS updates for net-next:
1) Move bridge keys in nft_meta to nft_meta_bridge, from wenxu.
2) Support for bridge pvid matching, from wenxu.
3) Support for bridge vlan protocol matching, also from wenxu.
4) Add br_vlan_get_pvid_rcu(), to fetch the bridge port pvid from packet path.
5) Prefer specific family extension in nf_tables.
6) Autoload specific family extension in case it is missing.
7) Add synproxy support to nf_tables, from Fernando Fernandez Mancera.
8) Support for GRE encapsulation in IPVS, from Vadim Fedorenko.
9) ICMP handling for GRE encapsulation, from Julian Anastasov.
10) Remove unused parameter in nf_queue, from Florian Westphal.
11) Replace seq_printf() by seq_puts() in nf_log, from Markus Elfring.
12) Rename nf_SYNPROXY.h => nf_synproxy.h before this header becomes public.
You can pull these changes from:
git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git
Thanks.
----------------------------------------------------------------
The following changes since commit 77cf8edbc0e7db6d68d1a49cf954849fb92cfa7c:
tipc: simplify stale link failure criteria (2019-06-25 13:28:57 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git HEAD
for you to fetch changes up to 0ef1efd1354d732d040f29b2005420f83fcdd8f4:
netfilter: nf_tables: force module load in case select_ops() returns -EAGAIN (2019-07-06 08:37:36 +0200)
----------------------------------------------------------------
Fernando Fernandez Mancera (1):
netfilter: nf_tables: Add synproxy support
Florian Westphal (1):
netfilter: nf_queue: remove unused hook entries pointer
Julian Anastasov (1):
ipvs: strip gre tunnel headers from icmp errors
Markus Elfring (1):
netfilter: nf_log: Replace a seq_printf() call by seq_puts() in seq_show()
Pablo Neira Ayuso (5):
netfilter: rename nf_SYNPROXY.h to nf_synproxy.h
bridge: add br_vlan_get_pvid_rcu()
netfilter: nf_tables: add nft_expr_type_request_module()
netfilter: nf_tables: __nft_expr_type_get() selects specific family type
netfilter: nf_tables: force module load in case select_ops() returns -EAGAIN
Vadim Fedorenko (1):
ipvs: allow tunneling with gre encapsulation
wenxu (5):
netfilter: nft_meta: move bridge meta keys into nft_meta_bridge
netfilter: nft_meta_bridge: Remove the br_private.h header
netfilter: nft_meta_bridge: add NFT_META_BRI_IIFPVID support
bridge: add br_vlan_get_proto()
netfilter: nft_meta_bridge: Add NFT_META_BRI_IIFVPROTO support
include/linux/if_bridge.h | 12 +
include/net/netfilter/nf_conntrack_synproxy.h | 1 +
include/net/netfilter/nf_queue.h | 3 +-
include/net/netfilter/nf_synproxy.h | 5 +
include/net/netfilter/nft_meta.h | 44 ++++
include/uapi/linux/ip_vs.h | 1 +
.../netfilter/{nf_SYNPROXY.h => nf_synproxy.h} | 4 +
include/uapi/linux/netfilter/nf_tables.h | 20 ++
include/uapi/linux/netfilter/xt_SYNPROXY.h | 2 +-
net/bridge/br_input.c | 2 +-
net/bridge/br_vlan.c | 29 ++-
net/bridge/netfilter/Kconfig | 6 +
net/bridge/netfilter/Makefile | 1 +
net/bridge/netfilter/nft_meta_bridge.c | 163 ++++++++++++
net/netfilter/Kconfig | 11 +
net/netfilter/Makefile | 1 +
net/netfilter/core.c | 2 +-
net/netfilter/ipvs/ip_vs_core.c | 46 +++-
net/netfilter/ipvs/ip_vs_ctl.c | 1 +
net/netfilter/ipvs/ip_vs_xmit.c | 66 ++++-
net/netfilter/nf_log.c | 2 +-
net/netfilter/nf_queue.c | 8 +-
net/netfilter/nf_synproxy_core.c | 2 +-
net/netfilter/nf_tables_api.c | 36 ++-
net/netfilter/nf_tables_core.c | 1 +
net/netfilter/nft_meta.c | 85 +++---
net/netfilter/nft_synproxy.c | 287 +++++++++++++++++++++
27 files changed, 757 insertions(+), 84 deletions(-)
create mode 100644 include/net/netfilter/nft_meta.h
rename include/uapi/linux/netfilter/{nf_SYNPROXY.h => nf_synproxy.h} (71%)
create mode 100644 net/bridge/netfilter/nft_meta_bridge.c
create mode 100644 net/netfilter/nft_synproxy.cPablo Neira Ayuso
maintainerPATCH 1/15 netfilter: rename nf_SYNPROXY.h to nf_synproxy.h
Uppercase is a reminiscence from the iptables infrastructure, rename this header before this is included in stable kernels.
---
include/uapi/linux/netfilter/{nf_SYNPROXY.h => nf_synproxy.h} | 0
include/uapi/linux/netfilter/xt_SYNPROXY.h | 2 +-
net/netfilter/nf_synproxy_core.c | 2 +-
3 files changed, 2 insertions(+), 2 deletions(-)
rename include/uapi/linux/netfilter/{nf_SYNPROXY.h => nf_synproxy.h} (100%)include/uapi/linux/netfilter/nf_synproxy.h renamed from include/uapi/linux/netfilter/nf_SYNPROXY.h +0 -0
include/uapi/linux/netfilter/xt_SYNPROXY.h +1 -1
@@ -2,7 +2,7 @@#ifndef _XT_SYNPROXY_H#define _XT_SYNPROXY_H -#include <linux/netfilter/nf_SYNPROXY.h> +#include <linux/netfilter/nf_synproxy.h> #define XT_SYNPROXY_OPT_MSS NF_SYNPROXY_OPT_MSS#define XT_SYNPROXY_OPT_WSCALE NF_SYNPROXY_OPT_WSCALE
net/netfilter/nf_synproxy_core.c +1 -1
@@ -11,7 +11,7 @@#include <linux/proc_fs.h> #include <linux/netfilter_ipv6.h> -#include <linux/netfilter/nf_SYNPROXY.h> +#include <linux/netfilter/nf_synproxy.h> #include <net/netfilter/nf_conntrack.h> #include <net/netfilter/nf_conntrack_ecache.h>
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 2/15 netfilter: nf_log: Replace a seq_printf() call by seq_puts() in seq_show()
In reply to Pablo Neira AyusoFrom: Markus Elfring <[email protected]>
A string which did not contain a data format specification should be put into a sequence. Thus use the corresponding function “seq_puts”.
This issue was detected by using the Coccinelle software.
--- net/netfilter/nf_log.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/netfilter/nf_log.c +1 -1
@@ -374,7 +374,7 @@ static int seq_show(struct seq_file *s, void *v)continue ; logger =nft_log_dereference (loggers[*pos][i]); -seq_printf (s,"%s" , logger->name); +seq_puts (s, logger->name);if (i ==0 && loggers[*pos][i +1 ] !=NULL )seq_puts (s,"," );
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 3/15 netfilter: nf_queue: remove unused hook entries pointer
In reply to Pablo Neira AyusoFrom: Florian Westphal <[email protected]>
Its not used anywhere, so remove this.
--- include/net/netfilter/nf_queue.h | 3 +-- net/bridge/br_input.c | 2 +- net/netfilter/core.c | 2 +- net/netfilter/nf_queue.c | 8 +++----- 4 files changed, 6 insertions(+), 9 deletions(-)
include/net/netfilter/nf_queue.h +1 -2
@@ -120,6 +120,5 @@ nfqueue_hash(const struct sk_buff *skb, u16 queue, u16 queues_total, u8 family, }int nf_queue (struct sk_buff *skb,struct nf_hook_state *state, -const struct nf_hook_entries *entries,unsigned int index, -unsigned int verdict); +unsigned int index,unsigned int verdict);#endif /* _NF_QUEUE_H */
net/bridge/br_input.c +1 -1
@@ -234,7 +234,7 @@ static int nf_hook_bridge_pre(struct sk_buff *skb, struct sk_buff **pskb)kfree_skb (skb);return RX_HANDLER_CONSUMED ;case NF_QUEUE : - ret =nf_queue (skb, &state, e, i, verdict); + ret =nf_queue (skb, &state, i, verdict);if (ret ==1 )continue ;return RX_HANDLER_CONSUMED ;
net/netfilter/core.c +1 -1
@@ -520,7 +520,7 @@ int nf_hook_slow(struct sk_buff *skb, struct nf_hook_state *state, ret = -EPERM ;return ret;case NF_QUEUE : - ret =nf_queue (skb, state, e, s, verdict); + ret =nf_queue (skb, state, s, verdict);if (ret ==1 )continue ;return ret;
net/netfilter/nf_queue.c +3 -5
@@ -156,7 +156,6 @@ static void nf_ip6_saveroute(const struct sk_buff *skb, }static int __nf_queue (struct sk_buff *skb,const struct nf_hook_state *state, -const struct nf_hook_entries *entries,unsigned int index,unsigned int queuenum) {int status = -ENOENT ;
@@ -225,12 +224,11 @@ static int __nf_queue(struct sk_buff *skb, const struct nf_hook_state *state,/* Packets leaving via this function must come back through nf_reinject(). */ int nf_queue (struct sk_buff *skb,struct nf_hook_state *state, -const struct nf_hook_entries *entries,unsigned int index, -unsigned int verdict) +unsigned int index,unsigned int verdict) {int ret; - ret =__nf_queue (skb, state, entries, index, verdict >>NF_VERDICT_QBITS ); + ret =__nf_queue (skb, state, index, verdict >>NF_VERDICT_QBITS );if (ret <0 ) {if (ret == -ESRCH && (verdict &NF_VERDICT_FLAG_QUEUE_BYPASS ))
@@ -336,7 +334,7 @@ void nf_reinject(struct nf_queue_entry *entry, unsigned int verdict)local_bh_enable ();break ;case NF_QUEUE : - err =nf_queue (skb, &entry->state, hooks, i, verdict); + err =nf_queue (skb, &entry->state, i, verdict);if (err ==1 ) goto next_hook;break ;
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 4/15 ipvs: allow tunneling with gre encapsulation
In reply to Pablo Neira AyusoFrom: Vadim Fedorenko <[email protected]>
windows real servers can handle gre tunnels, this patch allows gre encapsulation with the tunneling method, thereby letting ipvs be load balancer for windows-based services
--- include/uapi/linux/ip_vs.h | 1 + net/netfilter/ipvs/ip_vs_ctl.c | 1 + net/netfilter/ipvs/ip_vs_xmit.c | 66 +++++++++++++++++++++++++++++++++++++++-- 3 files changed, 65 insertions(+), 3 deletions(-)
include/uapi/linux/ip_vs.h +1 -0
@@ -128,6 +128,7 @@enum {IP_VS_CONN_F_TUNNEL_TYPE_IPIP =0 ,/* IPIP */ IP_VS_CONN_F_TUNNEL_TYPE_GUE ,/* GUE */ +IP_VS_CONN_F_TUNNEL_TYPE_GRE ,/* GRE */ IP_VS_CONN_F_TUNNEL_TYPE_MAX , };
net/netfilter/ipvs/ip_vs_ctl.c +1 -0
@@ -525,6 +525,7 @@ static void ip_vs_rs_hash(struct netns_ipvs *ipvs, struct ip_vs_dest *dest) port = dest->tun_port;break ;case IP_VS_CONN_F_TUNNEL_TYPE_IPIP : +case IP_VS_CONN_F_TUNNEL_TYPE_GRE : port =0 ;break ;default :
net/netfilter/ipvs/ip_vs_xmit.c +63 -3
126 lines not on this page · raw message
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 5/15 netfilter: nf_tables: Add synproxy support
In reply to Pablo Neira AyusoFrom: Fernando Fernandez Mancera <[email protected]>
Add synproxy support for nf_tables. This behaves like the iptables synproxy target but it is structured in a way that allows us to propose improvements in the future.
--- include/net/netfilter/nf_conntrack_synproxy.h | 1 + include/net/netfilter/nf_synproxy.h | 5 + include/uapi/linux/netfilter/nf_synproxy.h | 4 + include/uapi/linux/netfilter/nf_tables.h | 16 ++ net/netfilter/Kconfig | 11 + net/netfilter/Makefile | 1 + net/netfilter/nft_synproxy.c | 287 ++++++++++++++++++++++++++ 7 files changed, 325 insertions(+) create mode 100644 net/netfilter/nft_synproxy.c
include/net/netfilter/nf_conntrack_synproxy.h +1 -0
@@ -2,6 +2,7 @@#ifndef _NF_CONNTRACK_SYNPROXY_H#define _NF_CONNTRACK_SYNPROXY_H +#include <net/netfilter/nf_conntrack_seqadj.h> #include <net/netns/generic.h> struct nf_conn_synproxy {
include/net/netfilter/nf_synproxy.h +5 -0
@@ -39,6 +39,11 @@ unsigned int ipv6_synproxy_hook(void *priv, struct sk_buff *skb, const struct nf_hook_state *nhs);int nf_synproxy_ipv6_init (struct synproxy_net *snet,struct net *net);void nf_synproxy_ipv6_fini (struct synproxy_net *snet,struct net *net); +#else +static inline int +nf_synproxy_ipv6_init (struct synproxy_net *snet,struct net *net) {return 0 ; } +static inline void +nf_synproxy_ipv6_fini (struct synproxy_net *snet,struct net *net) {};#endif /* CONFIG_IPV6 */ #endif /* _NF_SYNPROXY_SHARED_H */
include/uapi/linux/netfilter/nf_synproxy.h +4 -0
@@ -9,6 +9,10 @@#define NF_SYNPROXY_OPT_SACK_PERM 0x04#define NF_SYNPROXY_OPT_TIMESTAMP 0x08#define NF_SYNPROXY_OPT_ECN 0x10 +#define NF_SYNPROXY_OPT_MASK (NF_SYNPROXY_OPT_MSS | \ + NF_SYNPROXY_OPT_WSCALE | \ + NF_SYNPROXY_OPT_SACK_PERM | \ + NF_SYNPROXY_OPT_TIMESTAMP)struct nf_synproxy_info {__u8 options;
include/uapi/linux/netfilter/nf_tables.h +16 -0
@@ -1552,6 +1552,22 @@ enum nft_osf_flags { };/** +* enum nft_synproxy_attributes - nf_tables synproxy expression netlink attributes +* +* @NFTA_SYNPROXY_MSS: mss value sent to the backend (NLA_U16) +* @NFTA_SYNPROXY_WSCALE: wscale value sent to the backend (NLA_U8) +* @NFTA_SYNPROXY_FLAGS: flags (NLA_U32) +*/ +enum nft_synproxy_attributes { +NFTA_SYNPROXY_UNSPEC , +NFTA_SYNPROXY_MSS , +NFTA_SYNPROXY_WSCALE , +NFTA_SYNPROXY_FLAGS , + __NFTA_SYNPROXY_MAX, +}; +#define NFTA_SYNPROXY_MAX (__NFTA_SYNPROXY_MAX - 1) + +/** * enum nft_device_attributes - nf_tables device netlink attributes * * @NFTA_DEVICE_NAME: name of this device (NLA_STRING)
net/netfilter/Kconfig +11 -0
@@ -651,6 +651,17 @@ config NFT_TPROXY help This makes transparent proxy support available in nftables. +config NFT_SYNPROXY + tristate "Netfilter nf_tables SYNPROXY expression support" + depends on NF_CONNTRACK && NETFILTER_ADVANCED + select NETFILTER_SYNPROXY + select SYN_COOKIES + help + The SYNPROXY expression allows you to intercept TCP connections and + establish them using syncookies before they are passed on to the + server. This allows to avoid conntrack and server resource usage + during SYN-flood attacks. + if NF_TABLES_NETDEV config NF_DUP_NETDEV
net/netfilter/Makefile +1 -0
@@ -110,6 +110,7 @@ obj-$(CONFIG_NFT_SOCKET) += nft_socket.o obj-$(CONFIG_NFT_OSF) += nft_osf.o obj-$(CONFIG_NFT_TPROXY) += nft_tproxy.o obj-$(CONFIG_NFT_XFRM) += nft_xfrm.o +obj-$(CONFIG_NFT_SYNPROXY) += nft_synproxy.o obj-$(CONFIG_NFT_NAT) += nft_chain_nat.o
net/netfilter/nft_synproxy.c new file +287 -0
287 lines not on this page · raw message
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 6/15 ipvs: strip gre tunnel headers from icmp errors
In reply to Pablo Neira AyusoFrom: Julian Anastasov <[email protected]>
Recognize GRE tunnels in received ICMP errors and
properly strip the tunnel headers.
--- net/netfilter/ipvs/ip_vs_core.c | 46 +++++++++++++++++++++++++++++++++++++---- 1 file changed, 42 insertions(+), 4 deletions(-)
net/netfilter/ipvs/ip_vs_core.c +42 -4
@@ -35,6 +35,7 @@#include <net/udp.h> #include <net/icmp.h> /* for icmp_send */ #include <net/gue.h> +#include <net/gre.h> #include <net/route.h> #include <net/ip6_checksum.h> #include <net/netns/generic.h> /* net_generic() */
@@ -1610,6 +1611,38 @@ static int ipvs_udp_decap(struct netns_ipvs *ipvs, struct sk_buff *skb,return 0 ; } +/* Check the GRE tunnel and return its header length */ +static int ipvs_gre_decap (struct netns_ipvs *ipvs,struct sk_buff *skb, +unsigned int offset,__u16 af, +const union nf_inet_addr *daddr,__u8 *proto) +{ +struct gre_base_hdr _greh, *greh; +struct ip_vs_dest *dest; + + greh =skb_header_pointer (skb, offset,sizeof (_greh), &_greh); +if (!greh) + goto unk; + dest =ip_vs_find_tunnel (ipvs, af, daddr,0 ); +if (!dest) + goto unk; +if (dest->tun_type ==IP_VS_CONN_F_TUNNEL_TYPE_GRE ) { +__be16 type; + +/* Only support version 0 and C (csum) */ +if ((greh->flags & ~GRE_CSUM ) !=0 ) + goto unk; + type = greh->protocol; +/* Later we can support also IPPROTO_IPV6 */ +if (type !=htons (ETH_P_IP )) + goto unk; + *proto =IPPROTO_IPIP ; +return gre_calc_hlen (gre_flags_to_tnl_flags (greh->flags)); + } + +unk: +return 0 ; +} +/* * Handle ICMP messages in the outside-to-inside direction (incoming). * Find any that might be relevant, check against existing connections,
@@ -1689,7 +1722,8 @@ ip_vs_in_icmp(struct netns_ipvs *ipvs, struct sk_buff *skb, int *related,if (cih ==NULL )return NF_ACCEPT ;/* The packet looks wrong, ignore */ ipip = true; - }else if (cih->protocol ==IPPROTO_UDP &&/* Can be UDP encap */ + }else if ((cih->protocol ==IPPROTO_UDP ||/* Can be UDP encap */ + cih->protocol ==IPPROTO_GRE ) &&/* Can be GRE encap */ /* Error for our tunnel must arrive at LOCAL_IN */ (skb_rtable (skb)->rt_flags &RTCF_LOCAL )) {__u8 iproto;
@@ -1699,10 +1733,14 @@ ip_vs_in_icmp(struct netns_ipvs *ipvs, struct sk_buff *skb, int *related,if (unlikely (cih->frag_off &htons (IP_OFFSET )))return NF_ACCEPT ; offset2 = offset + cih->ihl *4 ; - ulen =ipvs_udp_decap (ipvs, skb, offset2,AF_INET , raddr, - &iproto); +if (cih->protocol ==IPPROTO_UDP ) + ulen =ipvs_udp_decap (ipvs, skb, offset2,AF_INET , + raddr, &iproto); +else + ulen =ipvs_gre_decap (ipvs, skb, offset2,AF_INET , + raddr, &iproto);if (ulen >0 ) { -/* Skip IP and UDP tunnel headers */ +/* Skip IP and UDP/GRE tunnel headers */ offset = offset2 + ulen;/* Now we should be at the original IP header */ cih = skb_header_pointer(skb, offset, sizeof(_ciph),
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 7/15 netfilter: nft_meta: move bridge meta keys into nft_meta_bridge
In reply to Pablo Neira AyusoFrom: wenxu <[email protected]>
Separate bridge meta key from nft_meta to meta_bridge to avoid a dependency between the bridge module and nft_meta when using the bridge API available through include/linux/if_bridge.h
--- include/net/netfilter/nft_meta.h | 44 ++++++++++++ net/bridge/netfilter/Kconfig | 6 ++ net/bridge/netfilter/Makefile | 1 + net/bridge/netfilter/nft_meta_bridge.c | 127 +++++++++++++++++++++++++++++++++ net/netfilter/nf_tables_core.c | 1 + net/netfilter/nft_meta.c | 81 ++++++++------------- 6 files changed, 207 insertions(+), 53 deletions(-) create mode 100644 include/net/netfilter/nft_meta.h create mode 100644 net/bridge/netfilter/nft_meta_bridge.c
include/net/netfilter/nft_meta.h new file +44 -0
@@ -0,0 +1,44 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _NFT_META_H_ +#define _NFT_META_H_ + +struct nft_meta { +enum nft_meta_keys key:8 ; +union { +enum nft_registers dreg:8 ; +enum nft_registers sreg:8 ; + }; +}; + +extern const struct nla_policy nft_meta_policy[]; + +int nft_meta_get_init (const struct nft_ctx *ctx, +const struct nft_expr *expr, +const struct nlattr *const tb[]); + +int nft_meta_set_init (const struct nft_ctx *ctx, +const struct nft_expr *expr, +const struct nlattr *const tb[]); + +int nft_meta_get_dump (struct sk_buff *skb, +const struct nft_expr *expr); + +int nft_meta_set_dump (struct sk_buff *skb, +const struct nft_expr *expr); + +void nft_meta_get_eval (const struct nft_expr *expr, +struct nft_regs *regs, +const struct nft_pktinfo *pkt); + +void nft_meta_set_eval (const struct nft_expr *expr, +struct nft_regs *regs, +const struct nft_pktinfo *pkt); + +void nft_meta_set_destroy (const struct nft_ctx *ctx, +const struct nft_expr *expr); + +int nft_meta_set_validate (const struct nft_ctx *ctx, +const struct nft_expr *expr, +const struct nft_data **data); + +#endif
net/bridge/netfilter/Kconfig +6 -0
@@ -9,6 +9,12 @@ menuconfig NF_TABLES_BRIDGE bool "Ethernet Bridge nf_tables support" if NF_TABLES_BRIDGE + +config NFT_BRIDGE_META + tristate "Netfilter nf_table bridge meta support" + help + Add support for bridge dedicated meta key. + config NFT_BRIDGE_REJECT tristate "Netfilter nf_tables bridge reject support" depends on NFT_REJECT && NFT_REJECT_IPV4 && NFT_REJECT_IPV6
net/bridge/netfilter/Makefile +1 -0
@@ -3,6 +3,7 @@ # Makefile for the netfilter modules for Link Layer filtering on a bridge. # +obj-$(CONFIG_NFT_BRIDGE_META) += nft_meta_bridge.o obj-$(CONFIG_NFT_BRIDGE_REJECT) += nft_reject_bridge.o # connection tracking
net/bridge/netfilter/nft_meta_bridge.c new file +127 -0
127 lines not on this page · raw message
net/netfilter/nf_tables_core.c +1 -0
@@ -19,6 +19,7 @@#include <net/netfilter/nf_tables_core.h> #include <net/netfilter/nf_tables.h> #include <net/netfilter/nf_log.h> +#include <net/netfilter/nft_meta.h> static noinline void __nft_trace_packet(struct nft_traceinfo *info, const struct nft_chain *chain,
net/netfilter/nft_meta.c +28 -53
175 lines not on this page · raw message
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 8/15 netfilter: nft_meta_bridge: Remove the br_private.h header
In reply to Pablo Neira AyusoFrom: wenxu <[email protected]>
nft_bridge_meta should not access the bridge internal API.
--- net/bridge/netfilter/nft_meta_bridge.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-)
net/bridge/netfilter/nft_meta_bridge.c +14 -5
@@ -8,7 +8,14 @@#include <net/netfilter/nf_tables.h> #include <net/netfilter/nft_meta.h> -#include "../br_private.h" +static const struct net_device * +nft_meta_get_bridge (const struct net_device *dev) +{ +if (dev &&netif_is_bridge_port (dev)) +return netdev_master_upper_dev_get_rcu ((struct net_device *)dev); + +return NULL ; +} static void nft_meta_bridge_get_eval(const struct nft_expr *expr, struct nft_regs *regs,
@@ -17,22 +24,24 @@ static void nft_meta_bridge_get_eval(const struct nft_expr *expr,const struct nft_meta *priv =nft_expr_priv (expr);const struct net_device *in =nft_in (pkt), *out =nft_out (pkt);u32 *dest = ®s->data[priv->dreg]; -const struct net_bridge_port *p; +const struct net_device *br_dev;switch (priv->key) {case NFT_META_BRI_IIFNAME : -if (in ==NULL || (p =br_port_get_rcu (in)) ==NULL ) + br_dev =nft_meta_get_bridge (in); +if (!br_dev) goto err;break ;case NFT_META_BRI_OIFNAME : -if (out ==NULL || (p =br_port_get_rcu (out)) ==NULL ) + br_dev =nft_meta_get_bridge (out); +if (!br_dev) goto err;break ;default : goto out; } -strncpy ((char *)dest, p->br->dev->name,IFNAMSIZ ); +strncpy ((char *)dest, br_dev->name,IFNAMSIZ );return ; out:return nft_meta_get_eval (expr, regs, pkt);
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 9/15 bridge: add br_vlan_get_pvid_rcu()
In reply to Pablo Neira AyusoThis new function allows you to fetch bridge pvid from packet path.
--- include/linux/if_bridge.h | 6 ++++++ net/bridge/br_vlan.c | 19 +++++++++++++++---- 2 files changed, 21 insertions(+), 4 deletions(-)
include/linux/if_bridge.h +6 -0
@@ -88,6 +88,7 @@ static inline bool br_multicast_router(const struct net_device *dev)#if IS_ENABLED (CONFIG_BRIDGE ) &&IS_ENABLED (CONFIG_BRIDGE_VLAN_FILTERING )bool br_vlan_enabled (const struct net_device *dev);int br_vlan_get_pvid (const struct net_device *dev,u16 *p_pvid); +int br_vlan_get_pvid_rcu (const struct net_device *dev,u16 *p_pvid);int br_vlan_get_info (const struct net_device *dev,u16 vid,struct bridge_vlan_info *p_vinfo);#else
@@ -101,6 +102,11 @@ static inline int br_vlan_get_pvid(const struct net_device *dev, u16 *p_pvid)return -EINVAL ; } +static inline int br_vlan_get_pvid_rcu (const struct net_device *dev,u16 *p_pvid) +{ +return -EINVAL ; +} +static inline int br_vlan_get_info (const struct net_device *dev,u16 vid,struct bridge_vlan_info *p_vinfo) {
net/bridge/br_vlan.c +15 -4
@@ -1227,13 +1227,11 @@ void br_vlan_get_stats(const struct net_bridge_vlan *v, } } -int br_vlan_get_pvid (const struct net_device *dev,u16 *p_pvid) +static int __br_vlan_get_pvid (const struct net_device *dev, +struct net_bridge_port *p,u16 *p_pvid) {struct net_bridge_vlan_group *vg; -struct net_bridge_port *p; -ASSERT_RTNL (); - p =br_port_get_check_rtnl (dev);if (p) vg =nbp_vlan_group (p);else if (netif_is_bridge_master (dev))
@@ -1244,8 +1242,21 @@ int br_vlan_get_pvid(const struct net_device *dev, u16 *p_pvid) *p_pvid =br_get_pvid (vg);return 0 ; } + +int br_vlan_get_pvid (const struct net_device *dev,u16 *p_pvid) +{ +ASSERT_RTNL (); + +return __br_vlan_get_pvid (dev,br_port_get_check_rtnl (dev), p_pvid); +}EXPORT_SYMBOL_GPL (br_vlan_get_pvid); +int br_vlan_get_pvid_rcu (const struct net_device *dev,u16 *p_pvid) +{ +return __br_vlan_get_pvid (dev,br_port_get_check_rcu (dev), p_pvid); +} +EXPORT_SYMBOL_GPL (br_vlan_get_pvid_rcu); +int br_vlan_get_info (const struct net_device *dev,u16 vid,struct bridge_vlan_info *p_vinfo) {
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 10/15 netfilter: nft_meta_bridge: add NFT_META_BRI_IIFPVID support
In reply to Pablo Neira AyusoFrom: wenxu <[email protected]>
This patch allows you to match on the bridge port pvid, eg.
nft add rule bridge firewall zones counter meta ibrpvid 10
--- include/uapi/linux/netfilter/nf_tables.h | 2 ++ net/bridge/netfilter/nft_meta_bridge.c | 15 +++++++++++++++ 2 files changed, 17 insertions(+)
include/uapi/linux/netfilter/nf_tables.h +2 -0
@@ -795,6 +795,7 @@ enum nft_exthdr_attributes {* @NFT_META_SECPATH: boolean, secpath_exists (!!skb->sp) * @NFT_META_IIFKIND: packet input interface kind name (dev->rtnl_link_ops->kind) * @NFT_META_OIFKIND: packet output interface kind name (dev->rtnl_link_ops->kind) +* @NFT_META_BRI_IIFPVID: packet input bridge port pvid */ enum nft_meta_keys {NFT_META_LEN ,
@@ -825,6 +826,7 @@ enum nft_meta_keys {NFT_META_SECPATH ,NFT_META_IIFKIND ,NFT_META_OIFKIND , + NFT_META_BRI_IIFPVID, };/**
net/bridge/netfilter/nft_meta_bridge.c +15 -0
@@ -7,6 +7,7 @@#include <linux/netfilter/nf_tables.h> #include <net/netfilter/nf_tables.h> #include <net/netfilter/nft_meta.h> +#include <linux/if_bridge.h> static const struct net_device *nft_meta_get_bridge (const struct net_device *dev)
@@ -37,6 +38,17 @@ static void nft_meta_bridge_get_eval(const struct nft_expr *expr,if (!br_dev) goto err;break ; +case NFT_META_BRI_IIFPVID : { +u16 p_pvid; + + br_dev =nft_meta_get_bridge (in); +if (!br_dev || !br_vlan_enabled (br_dev)) + goto err; + +br_vlan_get_pvid_rcu (in, &p_pvid); +nft_reg_store16 (dest, p_pvid); +return ; + }default : goto out; }
@@ -62,6 +74,9 @@ static int nft_meta_bridge_get_init(const struct nft_ctx *ctx,case NFT_META_BRI_OIFNAME : len =IFNAMSIZ ;break ; +case NFT_META_BRI_IIFPVID : + len =sizeof (u16); +break ;default :return nft_meta_get_init (ctx, expr, tb); }
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 11/15 bridge: add br_vlan_get_proto()
In reply to Pablo Neira AyusoFrom: wenxu <[email protected]>
This new function allows you to fetch the bridge port vlan protocol.
--- include/linux/if_bridge.h | 6 ++++++ net/bridge/br_vlan.c | 10 ++++++++++ 2 files changed, 16 insertions(+)
include/linux/if_bridge.h +6 -0
@@ -89,6 +89,7 @@ static inline bool br_multicast_router(const struct net_device *dev)bool br_vlan_enabled (const struct net_device *dev);int br_vlan_get_pvid (const struct net_device *dev,u16 *p_pvid);int br_vlan_get_pvid_rcu (const struct net_device *dev,u16 *p_pvid); +int br_vlan_get_proto (const struct net_device *dev,u16 *p_proto);int br_vlan_get_info (const struct net_device *dev,u16 vid,struct bridge_vlan_info *p_vinfo);#else
@@ -102,6 +103,11 @@ static inline int br_vlan_get_pvid(const struct net_device *dev, u16 *p_pvid)return -EINVAL ; } +static inline int br_vlan_get_proto (const struct net_device *dev,u16 *p_proto) +{ +return -EINVAL ; +} +static inline int br_vlan_get_pvid_rcu (const struct net_device *dev,u16 *p_pvid) {return -EINVAL ;
net/bridge/br_vlan.c +10 -0
@@ -797,6 +797,16 @@ bool br_vlan_enabled(const struct net_device *dev) }EXPORT_SYMBOL_GPL (br_vlan_enabled); +int br_vlan_get_proto (const struct net_device *dev,u16 *p_proto) +{ +struct net_bridge *br =netdev_priv (dev); + + *p_proto =ntohs (br->vlan_proto); + +return 0 ; +} +EXPORT_SYMBOL_GPL (br_vlan_get_proto); +int __br_vlan_set_proto (struct net_bridge *br,__be16 proto) {int err =0 ;
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 12/15 netfilter: nft_meta_bridge: Add NFT_META_BRI_IIFVPROTO support
In reply to Pablo Neira AyusoFrom: wenxu <[email protected]>
This patch allows you to match on bridge vlan protocol, eg.
nft add rule bridge firewall zones counter meta ibrvproto 0x8100
--- include/uapi/linux/netfilter/nf_tables.h | 2 ++ net/bridge/netfilter/nft_meta_bridge.c | 12 ++++++++++++ 2 files changed, 14 insertions(+)
include/uapi/linux/netfilter/nf_tables.h +2 -0
@@ -796,6 +796,7 @@ enum nft_exthdr_attributes {* @NFT_META_IIFKIND: packet input interface kind name (dev->rtnl_link_ops->kind) * @NFT_META_OIFKIND: packet output interface kind name (dev->rtnl_link_ops->kind) * @NFT_META_BRI_IIFPVID: packet input bridge port pvid +* @NFT_META_BRI_IIFVPROTO: packet input bridge vlan proto */ enum nft_meta_keys {NFT_META_LEN ,
@@ -827,6 +828,7 @@ enum nft_meta_keys {NFT_META_IIFKIND ,NFT_META_OIFKIND ,NFT_META_BRI_IIFPVID , + NFT_META_BRI_IIFVPROTO, };/**
net/bridge/netfilter/nft_meta_bridge.c +12 -0
@@ -49,6 +49,17 @@ static void nft_meta_bridge_get_eval(const struct nft_expr *expr,nft_reg_store16 (dest, p_pvid);return ; } +case NFT_META_BRI_IIFVPROTO : { +u16 p_proto; + + br_dev =nft_meta_get_bridge (in); +if (!br_dev || !br_vlan_enabled (br_dev)) + goto err; + +br_vlan_get_proto (br_dev, &p_proto); +nft_reg_store16 (dest, p_proto); +return ; + }default : goto out; }
@@ -75,6 +86,7 @@ static int nft_meta_bridge_get_init(const struct nft_ctx *ctx, len =IFNAMSIZ ;break ;case NFT_META_BRI_IIFPVID : +case NFT_META_BRI_IIFVPROTO : len =sizeof (u16);break ;default :
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 13/15 netfilter: nf_tables: add nft_expr_type_request_module()
In reply to Pablo Neira AyusoThis helper function makes sure the family specific extension is loaded.
--- net/netfilter/nf_tables_api.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-)
net/netfilter/nf_tables_api.c +14 -3
@@ -2019,6 +2019,19 @@ static const struct nft_expr_type *__nft_expr_type_get(u8 family,return NULL ; } +#ifdef CONFIG_MODULES +static int nft_expr_type_request_module (struct net *net,u8 family, +struct nlattr *nla) +{ +nft_request_module (net,"nft-expr-%u-%.*s" , family, +nla_len (nla), (char *)nla_data (nla)); +if (__nft_expr_type_get (family, nla)) +return -EAGAIN ; + +return 0 ; +} +#endif +static const struct nft_expr_type *nft_expr_type_get (struct net *net,u8 family,struct nlattr *nla)
@@ -2035,9 +2048,7 @@ static const struct nft_expr_type *nft_expr_type_get(struct net *net,lockdep_nfnl_nft_mutex_not_held ();#ifdef CONFIG_MODULES if (type ==NULL ) { -nft_request_module (net,"nft-expr-%u-%.*s" , family, -nla_len (nla), (char *)nla_data (nla)); -if (__nft_expr_type_get (family, nla)) +if (nft_expr_type_request_module (net, family, nla) == -EAGAIN )return ERR_PTR (-EAGAIN ); nft_request_module(net, "nft-expr-%.*s",
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 14/15 netfilter: nf_tables: __nft_expr_type_get() selects specific family type
In reply to Pablo Neira AyusoIn case that there are two types, prefer the family specify extension.
--- net/netfilter/nf_tables_api.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
net/netfilter/nf_tables_api.c +8 -5
@@ -2009,14 +2009,17 @@ EXPORT_SYMBOL_GPL(nft_unregister_expr);static const struct nft_expr_type *__nft_expr_type_get (u8 family,struct nlattr *nla) { -const struct nft_expr_type *type; +const struct nft_expr_type *type, *candidate =NULL ;list_for_each_entry (type, &nf_tables_expressions, list) { -if (!nla_strcmp (nla, type->name) && - (!type->family || type->family == family)) -return type; +if (!nla_strcmp (nla, type->name)) { +if (!type->family && !candidate) + candidate = type; +else if (type->family == family) + candidate = type; + } } -return NULL ; +return candidate; }#ifdef CONFIG_MODULES
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 15/15 netfilter: nf_tables: force module load in case select_ops() returns -EAGAIN
In reply to Pablo Neira Ayusonft_meta needs to pull in the nft_meta_bridge module in case that this is a bridge family rule from the select_ops() path.
--- net/netfilter/nf_tables_api.c | 6 ++++++ net/netfilter/nft_meta.c | 4 ++++ 2 files changed, 10 insertions(+)
net/netfilter/nf_tables_api.c +6 -0
@@ -2144,6 +2144,12 @@ static int nf_tables_expr_parse(const struct nft_ctx *ctx, (const struct nlattr * const *)info->tb);if (IS_ERR (ops)) { err =PTR_ERR (ops); +#ifdef CONFIG_MODULES +if (err == -EAGAIN ) +nft_expr_type_request_module (ctx->net, + ctx->family, + tb[NFTA_EXPR_NAME ]); +#endif goto err1; } }else
net/netfilter/nft_meta.c +4 -0
@@ -519,6 +519,10 @@ nft_meta_select_ops(const struct nft_ctx *ctx,if (tb[NFTA_META_DREG ] && tb[NFTA_META_SREG ])return ERR_PTR (-EINVAL ); +#ifdef CONFIG_NF_TABLES_BRIDGE +if (ctx->family ==NFPROTO_BRIDGE ) +return ERR_PTR (-EAGAIN ); +#endif if (tb[NFTA_META_DREG ])return &nft_meta_get_ops;
Signature · 1 line
2.11.0
David Miller
maintainerFrom: Pablo Neira Ayuso <[email protected]>
Date: Mon, 8 Jul 2019 12:32:22 +0200
Quoted 1 line
The following patchset contains Netfilter/IPVS updates for net-next:
...
Quoted 3 lines
You can pull these changes from:
git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git
Pulled, thanks.