netfilter: nft_reject: introduce icmp code abstraction for inet and bridge
Subsystems (3)
Pablo Neira Ayuso
maintainerPATCH 1/2 netfilter: nft_reject: introduce icmp code abstraction for inet and bridge
This patch introduces the NFT_REJECT_ICMPX_UNREACH type which provides an abstraction to the ICMP and ICMPv6 codes that you can use from the inet and bridge tables, they are:
* NFT_REJECT_ICMPX_NO_ROUTE: no route to host - network unreachable
* NFT_REJECT_ICMPX_PORT_UNREACH: port unreachable
* NFT_REJECT_ICMPX_HOST_UNREACH: host unreachable
* NFT_REJECT_ICMPX_ADMIN_PROHIBITED: administratevely prohibited
You can still use the specific codes when restricting the rule to match the corresponding layer 3 protocol.
I decided to not overload the existing NFT_REJECT_ICMP_UNREACH to have different semantics depending on the table family and to allow the user to specify ICMP family specific codes if they restrict it to the corresponding family.
---
@Patrick: Alvaro should send the userspace part he's been working on soon.
include/net/netfilter/ipv4/nf_reject.h | 1 + include/net/netfilter/nft_reject.h | 9 +-- include/uapi/linux/netfilter/nf_tables.h | 21 +++++++ net/bridge/netfilter/nft_reject_bridge.c | 95 ++++++++++++++++++++++++++++-- net/ipv4/netfilter/nft_reject_ipv4.c | 1 - net/netfilter/nft_reject.c | 37 ++++++++++++ net/netfilter/nft_reject_inet.c | 94 +++++++++++++++++++++++++++-- 7 files changed, 241 insertions(+), 17 deletions(-)
include/net/netfilter/ipv4/nf_reject.h +1 -0
@@ -5,6 +5,7 @@#include <net/tcp.h> #include <net/route.h> #include <net/dst.h> +#include <net/icmp.h> static inline void nf_send_unreach (struct sk_buff *skb_in,int code) {
include/net/netfilter/nft_reject.h +2 -7
@@ -14,12 +14,7 @@ int nft_reject_init(const struct nft_ctx *ctx,int nft_reject_dump (struct sk_buff *skb,const struct nft_expr *expr); -void nft_reject_ipv4_eval (const struct nft_expr *expr, -struct nft_data data[NFT_REG_MAX +1 ], -const struct nft_pktinfo *pkt); - -void nft_reject_ipv6_eval (const struct nft_expr *expr, -struct nft_data data[NFT_REG_MAX +1 ], -const struct nft_pktinfo *pkt); +int nft_reject_icmp_code (u8 code); +int nft_reject_icmpv6_code (u8 code);#endif
include/uapi/linux/netfilter/nf_tables.h +21 -0
@@ -749,13 +749,34 @@ enum nft_queue_attributes {* * @NFT_REJECT_ICMP_UNREACH: reject using ICMP unreachable * @NFT_REJECT_TCP_RST: reject using TCP RST +* @NFT_REJECT_ICMPX_UNREACH: abstracted ICMP unreachable for bridge and inet */ enum nft_reject_types {NFT_REJECT_ICMP_UNREACH ,NFT_REJECT_TCP_RST , +NFT_REJECT_ICMPX_UNREACH , };/** +* enum nft_reject_code - Generic reject codes for IPv4/IPv6 +* +* @NFT_REJECT_ICMPX_NO_ROUTE: no route to host / network unreachable +* @NFT_REJECT_ICMPX_PORT_UNREACH: port unreachable +* @NFT_REJECT_ICMPX_HOST_UNREACH: host unreachable +* @NFT_REJECT_ICMPX_ADMIN_PROHIBITED: administratively prohibited +* +* These codes are mapped to real ICMP and ICMPv6 codes. +*/ +enum nft_reject_inet_code { +NFT_REJECT_ICMPX_NO_ROUTE =0 , +NFT_REJECT_ICMPX_PORT_UNREACH , +NFT_REJECT_ICMPX_HOST_UNREACH , +NFT_REJECT_ICMPX_ADMIN_PROHIBITED , + __NFT_REJECT_ICMPX_MAX +}; +#define NFT_REJECT_ICMPX_MAX (__NFT_REJECT_ICMPX_MAX + 1) + +/** * enum nft_reject_attributes - nf_tables reject expression netlink attributes * * @NFTA_REJECT_TYPE: packet type to use (NLA_U32: nft_reject_types)
net/bridge/netfilter/nft_reject_bridge.c +90 -5
119 lines not on this page · raw message
net/ipv4/netfilter/nft_reject_ipv4.c +0 -1
@@ -16,7 +16,6 @@#include <linux/netfilter.h> #include <linux/netfilter/nf_tables.h> #include <net/netfilter/nf_tables.h> -#include <net/icmp.h> #include <net/netfilter/ipv4/nf_reject.h> #include <net/netfilter/nft_reject.h>
net/netfilter/nft_reject.c +37 -0
@@ -17,6 +17,8 @@#include <linux/netfilter/nf_tables.h> #include <net/netfilter/nf_tables.h> #include <net/netfilter/nft_reject.h> +#include <linux/icmp.h> +#include <linux/icmpv6.h> const struct nla_policy nft_reject_policy[NFTA_REJECT_MAX +1 ] = { [NFTA_REJECT_TYPE ] = { .type =NLA_U32 },
@@ -70,5 +72,40 @@ nla_put_failure: }EXPORT_SYMBOL_GPL (nft_reject_dump); +static u8 icmp_code_v4[NFT_REJECT_ICMPX_MAX ] = { + [NFT_REJECT_ICMPX_NO_ROUTE ] =ICMP_NET_UNREACH , + [NFT_REJECT_ICMPX_PORT_UNREACH ] =ICMP_PORT_UNREACH , + [NFT_REJECT_ICMPX_HOST_UNREACH ] =ICMP_HOST_UNREACH , + [NFT_REJECT_ICMPX_ADMIN_PROHIBITED ] =ICMP_PKT_FILTERED , +}; + +int nft_reject_icmp_code (u8 code) +{ +if (code >NFT_REJECT_ICMPX_MAX ) +return -EINVAL ; + +return icmp_code_v4[code]; +} + +EXPORT_SYMBOL_GPL (nft_reject_icmp_code); + + +static u8 icmp_code_v6[NFT_REJECT_ICMPX_MAX ] = { + [NFT_REJECT_ICMPX_NO_ROUTE ] =ICMPV6_NOROUTE , + [NFT_REJECT_ICMPX_PORT_UNREACH ] =ICMPV6_PORT_UNREACH , + [NFT_REJECT_ICMPX_HOST_UNREACH ] =ICMPV6_ADDR_UNREACH , + [NFT_REJECT_ICMPX_ADMIN_PROHIBITED ] =ICMPV6_ADM_PROHIBITED , +}; + +int nft_reject_icmpv6_code (u8 code) +{ +if (code >NFT_REJECT_ICMPX_MAX ) +return -EINVAL ; + +return icmp_code_v6[code]; +} + +EXPORT_SYMBOL_GPL (nft_reject_icmpv6_code); +MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Patrick McHardy <[email protected]>" );
net/netfilter/nft_reject_inet.c +90 -4
115 lines not on this page · raw message
Signature · 1 line
1.7.10.4
Pablo Neira Ayuso
maintainerPATCH 2/2 netfilter: move nf_send_resetX() code to nf_reject_ipvX modules
Move nf_send_reset() and nf_send_reset6() to nf_reject_ipv4 and nf_reject_ipv6 respectively. This code is shared by x_tables and nf_tables.
--- include/net/netfilter/ipv4/nf_reject.h | 118 +---------------------- net/ipv4/netfilter/Kconfig | 6 ++ net/ipv4/netfilter/Makefile | 3 + net/ipv4/netfilter/nf_reject_ipv4.c | 127 +++++++++++++++++++++++++ net/ipv6/netfilter/Kconfig | 6 ++ net/ipv6/netfilter/Makefile | 3 + net/ipv6/netfilter/nf_reject_ipv6.c | 163 ++++++++++++++++++++++++++++++++ 7 files changed, 309 insertions(+), 117 deletions(-) create mode 100644 net/ipv4/netfilter/nf_reject_ipv4.c create mode 100644 net/ipv6/netfilter/nf_reject_ipv6.c
include/net/netfilter/ipv4/nf_reject.h +1 -117
@@ -1,10 +1,6 @@#ifndef _IPV4_NF_REJECT_H#define _IPV4_NF_REJECT_H -#include <net/ip.h> -#include <net/tcp.h> -#include <net/route.h> -#include <net/dst.h> #include <net/icmp.h> static inline void nf_send_unreach (struct sk_buff *skb_in,int code)
@@ -12,118 +8,6 @@ static inline void nf_send_unreach(struct sk_buff *skb_in, int code) icmp_send(skb_in, ICMP_DEST_UNREACH, code, 0); } -/* Send RST reply */ -static void nf_send_reset (struct sk_buff *oldskb,int hook) -{ -struct sk_buff *nskb; -const struct iphdr *oiph; -struct iphdr *niph; -const struct tcphdr *oth; -struct tcphdr _otcph, *tcph; - -/* IP header checks: fragment. */ -if (ip_hdr (oldskb)->frag_off &htons (IP_OFFSET )) -return ; - - oth =skb_header_pointer (oldskb,ip_hdrlen (oldskb), -sizeof (_otcph), &_otcph); -if (oth ==NULL ) -return ; - -/* No RST for RST. */ -if (oth->rst) -return ; - -if (skb_rtable (oldskb)->rt_flags & (RTCF_BROADCAST |RTCF_MULTICAST )) -return ; - -/* Check checksum */ -if (nf_ip_checksum (oldskb, hook,ip_hdrlen (oldskb),IPPROTO_TCP )) -return ; - oiph =ip_hdr (oldskb); - - nskb =alloc_skb (sizeof (struct iphdr ) +sizeof (struct tcphdr ) + -LL_MAX_HEADER ,GFP_ATOMIC ); -if (!nskb) -return ; - -skb_reserve (nskb,LL_MAX_HEADER ); - -skb_reset_network_header (nskb); - niph = (struct iphdr *)skb_put (nskb,sizeof (struct iphdr )); - niph->version =4 ; - niph->ihl =sizeof (struct iphdr ) /4 ; - niph->tos =0 ; - niph->id =0 ; - niph->frag_off =htons (IP_DF ); - niph->protocol =IPPROTO_TCP ; - niph->check =0 ; - niph->saddr = oiph->daddr; - niph->daddr = oiph->saddr; - -skb_reset_transport_header (nskb); - tcph = (struct tcphdr *)skb_put (nskb,sizeof (struct tcphdr )); -memset (tcph,0 ,sizeof (*tcph)); - tcph->source = oth->dest; - tcph->dest = oth->source; - tcph->doff =sizeof (struct tcphdr ) /4 ; - -if (oth->ack) - tcph->seq = oth->ack_seq; -else { - tcph->ack_seq =htonl (ntohl (oth->seq) + oth->syn + oth->fin + - oldskb->len -ip_hdrlen (oldskb) - - (oth->doff <<2 )); - tcph->ack =1 ; - } - - tcph->rst =1 ; - tcph->check = ~tcp_v4_check (sizeof (struct tcphdr ), niph->saddr, - niph->daddr,0 ); - nskb->ip_summed =CHECKSUM_PARTIAL ; - nskb->csum_start = (unsigned char *)tcph - nskb->head; - nskb->csum_offset = offsetof(struct tcphdr , check); - -/* ip_route_me_harder expects skb->dst to be set */ -skb_dst_set_noref (nskb,skb_dst (oldskb)); - - nskb->protocol =htons (ETH_P_IP ); -if (ip_route_me_harder (nskb,RTN_UNSPEC )) - goto free_nskb; - - niph->ttl =ip4_dst_hoplimit (skb_dst (nskb)); - -/* "Never happens" */ -if (nskb->len >dst_mtu (skb_dst (nskb))) - goto free_nskb; - -nf_ct_attach (nskb, oldskb); - -#if IS_ENABLED (CONFIG_BRIDGE_NETFILTER ) -/* If we use ip_local_out for bridged traffic, the MAC source on -* the RST will be ours, instead of the destination's. This confuses -* some routers/firewalls, and they drop the packet. So we need to -* build the eth header using the original destination's MAC as the -* source, and send the RST packet directly. -*/ -if (oldskb->nf_bridge) { -struct ethhdr *oeth =eth_hdr (oldskb); - nskb->dev = oldskb->nf_bridge->physindev; - niph->tot_len =htons (nskb->len); -ip_send_check (niph); -if (dev_hard_header (nskb, nskb->dev,ntohs (nskb->protocol), - oeth->h_source, oeth->h_dest, nskb->len) <0 ) - goto free_nskb; -dev_queue_xmit (nskb); - } else -#endif -ip_local_out (nskb); - -return ; - - free_nskb: -kfree_skb (nskb); -} - +void nf_send_reset (struct sk_buff *oldskb,int hook);#endif /* _IPV4_NF_REJECT_H */
net/ipv4/netfilter/Kconfig +6 -0
@@ -61,8 +61,13 @@ config NFT_CHAIN_ROUTE_IPV4 fields such as the source, destination, type of service and the packet mark. +config NF_REJECT_IPV4 + tristate "IPv4 packet rejection" + default m if NETFILTER_ADVANCED=n + config NFT_REJECT_IPV4 depends on NF_TABLES_IPV4 + select NF_REJECT_IPV4 default NFT_REJECT tristate
@@ -208,6 +213,7 @@ config IP_NF_FILTER config IP_NF_TARGET_REJECT tristate "REJECT target support" depends on IP_NF_FILTER + select NF_REJECT_IPV4 default m if NETFILTER_ADVANCED=n help The REJECT target allows a filtering rule to specify that an ICMP
net/ipv4/netfilter/Makefile +3 -0
@@ -23,6 +23,9 @@ obj-$(CONFIG_NF_DEFRAG_IPV4) += nf_defrag_ipv4.o obj-$(CONFIG_NF_LOG_ARP) += nf_log_arp.o obj-$(CONFIG_NF_LOG_IPV4) += nf_log_ipv4.o +# reject +obj-$(CONFIG_NF_REJECT_IPV4) += nf_reject_ipv4.o + # NAT helpers (nf_conntrack) obj-$(CONFIG_NF_NAT_H323) += nf_nat_h323.o obj-$(CONFIG_NF_NAT_PPTP) += nf_nat_pptp.o
net/ipv4/netfilter/nf_reject_ipv4.c new file +127 -0
127 lines not on this page · raw message
net/ipv6/netfilter/Kconfig +6 -0
@@ -40,8 +40,13 @@ config NFT_CHAIN_ROUTE_IPV6 fields such as the source, destination, flowlabel, hop-limit and the packet mark. +config NF_REJECT_IPV6 + tristate "IPv6 packet rejection" + default m if NETFILTER_ADVANCED=n + config NFT_REJECT_IPV6 depends on NF_TABLES_IPV6 + select NF_REJECT_IPV6 default NFT_REJECT tristate
@@ -208,6 +213,7 @@ config IP6_NF_FILTER config IP6_NF_TARGET_REJECT tristate "REJECT target support" depends on IP6_NF_FILTER + select NF_REJECT_IPV6 default m if NETFILTER_ADVANCED=n help The REJECT target allows a filtering rule to specify that an ICMPv6
net/ipv6/netfilter/Makefile +3 -0
@@ -27,6 +27,9 @@ obj-$(CONFIG_NF_DEFRAG_IPV6) += nf_defrag_ipv6.o # logging obj-$(CONFIG_NF_LOG_IPV6) += nf_log_ipv6.o +# reject +obj-$(CONFIG_NF_REJECT_IPV6) += nf_reject_ipv6.o + # nf_tables obj-$(CONFIG_NF_TABLES_IPV6) += nf_tables_ipv6.o obj-$(CONFIG_NFT_CHAIN_ROUTE_IPV6) += nft_chain_route_ipv6.o
net/ipv6/netfilter/nf_reject_ipv6.c new file +163 -0
163 lines not on this page · raw message
Signature · 1 line
1.7.10.4