netfilter: nf_tables: Use 32 bit addressing register from nft_type_to_reg()
Subsystems (3)
Pablo Neira Ayuso
maintainerPATCH 1/1 netfilter: nf_tables: Use 32 bit addressing register from nft_type_to_reg()
[ upstream commit bf798657eb5ba57552096843c315f096fdf9b715 ]
nft_type_to_reg() needs to return the register in the new 32 bit addressing, otherwise we hit EINVAL when using mappings.
--- include/net/netfilter/nf_tables.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/net/netfilter/nf_tables.h +1 -1
@@ -125,7 +125,7 @@ static inline enum nft_data_types nft_dreg_to_type(enum nft_registers reg)static inline enum nft_registers nft_type_to_reg (enum nft_data_types type) { -return type ==NFT_DATA_VERDICT ?NFT_REG_VERDICT :NFT_REG_1 ; +return type ==NFT_DATA_VERDICT ?NFT_REG_VERDICT :NFT_REG_1 *NFT_REG_SIZE /NFT_REG32_SIZE ; }unsigned int nft_parse_register (const struct nlattr *attr);
Signature · 1 line
1.7.10.4
Pablo Neira Ayuso
maintainerPATCH 1/1 netfilter: bridge: fix IPv6 packets not being bridged with CONFIG_IPV6=n
From: Bernhard Thaler <[email protected]>
[ upstream commit 18e1db67e93ed75d9dc0d34c8d783ccf10547c2b ]
230ac490f7fba introduced a dependency to CONFIG_IPV6 which breaks bridging of IPv6 packets on a bridge with CONFIG_IPV6=n.
Sysctl entry /proc/sys/net/bridge/bridge-nf-call-ip6tables defaults to 1, for this reason packets are handled by br_nf_pre_routing_ipv6(). When compiled with CONFIG_IPV6=n this function returns NF_DROP but should return NF_ACCEPT to let packets through.
Change CONFIG_IPV6=n br_nf_pre_routing_ipv6() return value to NF_ACCEPT.
Tested with a simple bridge with two interfaces and IPv6 packets trying to pass from host on left side to host on right side of the bridge.
--- include/net/netfilter/br_netfilter.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/net/netfilter/br_netfilter.h +1 -1
@@ -59,7 +59,7 @@ static inline unsigned int br_nf_pre_routing_ipv6(const struct nf_hook_ops *ops, struct sk_buff *skb, const struct nf_hook_state *state) { - return NF_DROP; + return NF_ACCEPT; }#endif
Signature · 1 line
1.7.10.4
Pablo Neira Ayuso
maintainerPATCH 1/1 netfilter: ipset: Out of bound access in hash:net* types fixed
In reply to Pablo Neira AyusoFrom: Jozsef Kadlecsik <[email protected]>
[ upstream commit 6fe7ccfd77415a6ba250c10c580eb3f9acf79753 ]
Dave Jones reported that KASan detected out of bounds access in hash:net* types:
[ 23.139532] ================================================================== [ 23.146130] BUG: KASan: out of bounds access in hash_net4_add_cidr+0x1db/0x220 at addr ffff8800d4844b58 [ 23.152937] Write of size 4 by task ipset/457 [ 23.159742] ============================================================================= [ 23.166672] BUG kmalloc-512 (Not tainted): kasan: bad access detected [ 23.173641] ----------------------------------------------------------------------------- [ 23.194668] INFO: Allocated in hash_net_create+0x16a/0x470 age=7 cpu=1 pid=456 [ 23.201836] __slab_alloc.constprop.66+0x554/0x620 [ 23.208994] __kmalloc+0x2f2/0x360 [ 23.216105] hash_net_create+0x16a/0x470 [ 23.223238] ip_set_create+0x3e6/0x740 [ 23.230343] nfnetlink_rcv_msg+0x599/0x640 [ 23.237454] netlink_rcv_skb+0x14f/0x190 [ 23.244533] nfnetlink_rcv+0x3f6/0x790 [ 23.251579] netlink_unicast+0x272/0x390 [ 23.258573] netlink_sendmsg+0x5a1/0xa50 [ 23.265485] SYSC_sendto+0x1da/0x2c0 [ 23.272364] SyS_sendto+0xe/0x10 [ 23.279168] entry_SYSCALL_64_fastpath+0x12/0x6f
The bug is fixed in the patch and the testsuite is extended in ipset to check cidr handling more thoroughly.
--- net/netfilter/ipset/ip_set_hash_gen.h | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
net/netfilter/ipset/ip_set_hash_gen.h +8 -4
@@ -152,9 +152,13 @@ htable_bits(u32 hashsize)#define SET_HOST_MASK (family) (family == AF_INET ? 32 : 128)#ifdef IP_SET_HASH_WITH_NET0 +/* cidr from 0 to SET_HOST_MASK() value and c = cidr + 1 */ #define NLEN (family) (SET_HOST_MASK(family) + 1) +#define CIDR_POS (c) ((c) - 1)#else +/* cidr from 1 to SET_HOST_MASK() value and c = cidr + 1 */ #define NLEN (family) SET_HOST_MASK(family) +#define CIDR_POS (c) ((c) - 2)#endif #else
@@ -305,7 +309,7 @@ mtype_add_cidr(struct htype *h, u8 cidr, u8 nets_length, u8 n) }else if (h->nets[i].cidr[n] < cidr) { j = i; }else if (h->nets[i].cidr[n] == cidr) { - h->nets[cidr -1 ].nets[n]++; + h->nets[CIDR_POS (cidr)].nets[n]++;return ; } }
@@ -314,7 +318,7 @@ mtype_add_cidr(struct htype *h, u8 cidr, u8 nets_length, u8 n) h->nets[i].cidr[n] = h->nets[i -1 ].cidr[n]; } h->nets[i].cidr[n] = cidr; - h->nets[cidr -1 ].nets[n] =1 ; + h->nets[CIDR_POS (cidr)].nets[n] =1 ; } static void
@@ -325,8 +329,8 @@ mtype_del_cidr(struct htype *h, u8 cidr, u8 nets_length, u8 n)for (i =0 ; i < nets_length; i++) {if (h->nets[i].cidr[n] != cidr)continue ; - h->nets[cidr -1 ].nets[n]--; -if (h->nets[cidr -1 ].nets[n] >0 ) + h->nets[CIDR_POS (cidr)].nets[n]--; +if (h->nets[CIDR_POS (cidr)].nets[n] >0 )return ;for (j = i; j < net_end && h->nets[j].cidr[n]; j++) h->nets[j].cidr[n] = h->nets[j +1 ].cidr[n];
Signature · 1 line
1.7.10.4
Pablo Neira Ayuso
maintainerPATCH 1/1 netfilter: ipset: Fixing unnamed union init
In reply to Pablo Neira AyusoFrom: Elad Raz <[email protected]>
[ upstream commit 96be5f2806cd65a2ebced3bfcdf7df0116e6c4a6 ]
In continue to proposed Vinson Lee's post [1], this patch fixes compilation issues founded at gcc 4.4.7. The initialization of .cidr field of unnamed unions causes compilation error in gcc 4.4.x.
References
Visible links
[1] https://lkml.org/lkml/2015/7/5/74
--- net/netfilter/ipset/ip_set_hash_netnet.c | 20 ++++++++++++++++++-- net/netfilter/ipset/ip_set_hash_netportnet.c | 20 ++++++++++++++++++-- 2 files changed, 36 insertions(+), 4 deletions(-)
net/netfilter/ipset/ip_set_hash_netnet.c +18 -2
@@ -131,6 +131,13 @@ hash_netnet4_data_next(struct hash_netnet4_elem *next,#define HOST_MASK 32#include "ip_set_hash_gen.h" +static void +hash_netnet4_init (struct hash_netnet4_elem *e) +{ + e->cidr[0 ] =HOST_MASK ; + e->cidr[1 ] =HOST_MASK ; +} + static int hash_netnet4_kadt(struct ip_set *set, const struct sk_buff *skb, const struct xt_action_param *par,
@@ -160,7 +167,7 @@ hash_netnet4_uadt(struct ip_set *set, struct nlattr *tb[], {const struct hash_netnet *h = set->data;ipset_adtfn adtfn = set->variant->adt[adt]; -struct hash_netnet4_elem e = { .cidr = {HOST_MASK ,HOST_MASK , }, }; +struct hash_netnet4_elem e = { };struct ip_set_ext ext =IP_SET_INIT_UEXT (set);u32 ip =0 , ip_to =0 , last;u32 ip2 =0 , ip2_from =0 , ip2_to =0 , last2;
@@ -169,6 +176,7 @@ hash_netnet4_uadt(struct ip_set *set, struct nlattr *tb[],if (tb[IPSET_ATTR_LINENO ]) *lineno =nla_get_u32 (tb[IPSET_ATTR_LINENO ]); +hash_netnet4_init (&e);if (unlikely (!tb[IPSET_ATTR_IP ] || !tb[IPSET_ATTR_IP2 ] || !ip_set_optattr_netorder (tb,IPSET_ATTR_CADT_FLAGS )))return -IPSET_ERR_PROTOCOL ;
@@ -357,6 +365,13 @@ hash_netnet6_data_next(struct hash_netnet4_elem *next,#define IP_SET_EMIT_CREATE #include "ip_set_hash_gen.h" +static void +hash_netnet6_init (struct hash_netnet6_elem *e) +{ + e->cidr[0 ] =HOST_MASK ; + e->cidr[1 ] =HOST_MASK ; +} + static int hash_netnet6_kadt(struct ip_set *set, const struct sk_buff *skb, const struct xt_action_param *par,
@@ -385,13 +400,14 @@ hash_netnet6_uadt(struct ip_set *set, struct nlattr *tb[], enum ipset_adt adt, u32 *lineno, u32 flags, bool retried) { ipset_adtfn adtfn = set->variant->adt[adt]; -struct hash_netnet6_elem e = { .cidr = {HOST_MASK ,HOST_MASK , }, }; +struct hash_netnet6_elem e = { };struct ip_set_ext ext =IP_SET_INIT_UEXT (set);int ret;if (tb[IPSET_ATTR_LINENO ]) *lineno =nla_get_u32 (tb[IPSET_ATTR_LINENO ]); +hash_netnet6_init (&e);if (unlikely (!tb[IPSET_ATTR_IP ] || !tb[IPSET_ATTR_IP2 ] || !ip_set_optattr_netorder (tb,IPSET_ATTR_CADT_FLAGS )))return -IPSET_ERR_PROTOCOL ;
net/netfilter/ipset/ip_set_hash_netportnet.c +18 -2
@@ -142,6 +142,13 @@ hash_netportnet4_data_next(struct hash_netportnet4_elem *next,#define HOST_MASK 32#include "ip_set_hash_gen.h" +static void +hash_netportnet4_init (struct hash_netportnet4_elem *e) +{ + e->cidr[0 ] =HOST_MASK ; + e->cidr[1 ] =HOST_MASK ; +} + static int hash_netportnet4_kadt(struct ip_set *set, const struct sk_buff *skb, const struct xt_action_param *par,
@@ -175,7 +182,7 @@ hash_netportnet4_uadt(struct ip_set *set, struct nlattr *tb[], {const struct hash_netportnet *h = set->data;ipset_adtfn adtfn = set->variant->adt[adt]; -struct hash_netportnet4_elem e = { .cidr = {HOST_MASK ,HOST_MASK , }, }; +struct hash_netportnet4_elem e = { };struct ip_set_ext ext =IP_SET_INIT_UEXT (set);u32 ip =0 , ip_to =0 , ip_last, p =0 , port, port_to;u32 ip2_from =0 , ip2_to =0 , ip2_last, ip2;
@@ -185,6 +192,7 @@ hash_netportnet4_uadt(struct ip_set *set, struct nlattr *tb[],if (tb[IPSET_ATTR_LINENO ]) *lineno =nla_get_u32 (tb[IPSET_ATTR_LINENO ]); +hash_netportnet4_init (&e); if (unlikely(!tb[IPSET_ATTR_IP] || !tb[IPSET_ATTR_IP2] || !ip_set_attr_netorder(tb, IPSET_ATTR_PORT) || !ip_set_optattr_netorder(tb, IPSET_ATTR_PORT_TO) ||
@@ -412,6 +420,13 @@ hash_netportnet6_data_next(struct hash_netportnet4_elem *next,#define IP_SET_EMIT_CREATE #include "ip_set_hash_gen.h" +static void +hash_netportnet6_init (struct hash_netportnet6_elem *e) +{ + e->cidr[0 ] =HOST_MASK ; + e->cidr[1 ] =HOST_MASK ; +} + static int hash_netportnet6_kadt(struct ip_set *set, const struct sk_buff *skb, const struct xt_action_param *par,
@@ -445,7 +460,7 @@ hash_netportnet6_uadt(struct ip_set *set, struct nlattr *tb[], {const struct hash_netportnet *h = set->data;ipset_adtfn adtfn = set->variant->adt[adt]; -struct hash_netportnet6_elem e = { .cidr = {HOST_MASK ,HOST_MASK , }, }; +struct hash_netportnet6_elem e = { };struct ip_set_ext ext =IP_SET_INIT_UEXT (set);u32 port, port_to;bool with_ports = false;
@@ -454,6 +469,7 @@ hash_netportnet6_uadt(struct ip_set *set, struct nlattr *tb[],if (tb[IPSET_ATTR_LINENO ]) *lineno =nla_get_u32 (tb[IPSET_ATTR_LINENO ]); +hash_netportnet6_init (&e); if (unlikely(!tb[IPSET_ATTR_IP] || !tb[IPSET_ATTR_IP2] || !ip_set_attr_netorder(tb, IPSET_ATTR_PORT) || !ip_set_optattr_netorder(tb, IPSET_ATTR_PORT_TO) ||
Signature · 1 line
1.7.10.4
Pablo Neira Ayuso
maintainerPATCH 1/1 netfilter: nfnetlink: work around wrong endianess in res_id field
In reply to Pablo Neira Ayuso[ upstream commit a9de9777d613500b089a7416f936bf3ae5f070d2 ]
The convention in nfnetlink is to use network byte order in every header field as well as in the attribute payload. The initial version of the batching infrastructure assumes that res_id comes in host byte order though.
The only client of the batching infrastructure is nf_tables, so let's add a workaround to address this inconsistency. We currently have 11 nfnetlink subsystems according to NFNL_SUBSYS_COUNT, so we can assume that the subsystem 2560, ie. htons(10), will not be allocated anytime soon, so it can be an alias of nf_tables from the nfnetlink batching path when interpreting the res_id field.
Based on original patch from Florian Westphal.
--- net/netfilter/nfnetlink.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
net/netfilter/nfnetlink.c +7 -1
@@ -444,6 +444,7 @@ done:static void nfnetlink_rcv (struct sk_buff *skb) {struct nlmsghdr *nlh =nlmsg_hdr (skb); +u_int16_t res_id;int msglen; if (nlh->nlmsg_len < NLMSG_HDRLEN ||
@@ -468,7 +469,12 @@ static void nfnetlink_rcv(struct sk_buff *skb) nfgenmsg =nlmsg_data (nlh);skb_pull (skb, msglen); -nfnetlink_rcv_batch (skb, nlh, nfgenmsg->res_id); +/* Work around old nft using host byte order */ +if (nfgenmsg->res_id ==NFNL_SUBSYS_NFTABLES ) + res_id =NFNL_SUBSYS_NFTABLES ; +else + res_id =ntohs (nfgenmsg->res_id); +nfnetlink_rcv_batch (skb, nlh, res_id); }else {netlink_rcv_skb (skb, &nfnetlink_rcv_msg); }
Signature · 1 line
1.7.10.4
Pablo Neira Ayuso
maintainerPATCH 1/1 netfilter: conntrack: use nf_ct_tmpl_free in CT/synproxy error paths
In reply to Pablo Neira AyusoFrom: Daniel Borkmann <[email protected]>
[ upstream commit 9cf94eab8b309e8bcc78b41dd1561c75b537dd0b ]
Commit 0838aa7fcfcd ("netfilter: fix netns dependencies with conntrack templates") migrated templates to the new allocator api, but forgot to update error paths for them in CT and synproxy to use nf_ct_tmpl_free() instead of nf_conntrack_free().
Due to that, memory is being freed into the wrong kmemcache, but also we drop the per net reference count of ct objects causing an imbalance.
In Brad's case, this leads to a wrap-around of net->ct.count and thus lets __nf_conntrack_alloc() refuse to create a new ct object:
[ 10.340913] xt_addrtype: ipv6 does not support BROADCAST matching [ 10.810168] nf_conntrack: table full, dropping packet [ 11.917416] r8169 0000:07:00.0 eth0: link up [ 11.917438] IPv6: ADDRCONF(NETDEV_CHANGE): eth0: link becomes ready [ 12.815902] nf_conntrack: table full, dropping packet [ 15.688561] nf_conntrack: table full, dropping packet [ 15.689365] nf_conntrack: table full, dropping packet [ 15.690169] nf_conntrack: table full, dropping packet [ 15.690967] nf_conntrack: table full, dropping packet [...]
With slab debugging, it also reports the wrong kmemcache (kmalloc-512 vs. nf_conntrack_ffffffff81ce75c0) and reports poison overwrites, etc. Thus, to fix the problem, export and use nf_ct_tmpl_free() instead.
--- include/net/netfilter/nf_conntrack.h | 1 + net/netfilter/nf_conntrack_core.c | 3 ++- net/netfilter/nf_synproxy_core.c | 2 +- net/netfilter/xt_CT.c | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-)
include/net/netfilter/nf_conntrack.h +1 -0
@@ -292,6 +292,7 @@ extern unsigned int nf_conntrack_hash_rnd;void init_nf_conntrack_hash_rnd (void );struct nf_conn *nf_ct_tmpl_alloc (struct net *net,u16 zone,gfp_t flags); +void nf_ct_tmpl_free (struct nf_conn *tmpl);#define NF_CT_STAT_INC (net, count) __this_cpu_inc((net)->ct.stat->count)#define NF_CT_STAT_INC_ATOMIC (net, count) this_cpu_inc((net)->ct.stat->count)
net/netfilter/nf_conntrack_core.c +2 -1
@@ -320,12 +320,13 @@ out_free: }EXPORT_SYMBOL_GPL (nf_ct_tmpl_alloc); -static void nf_ct_tmpl_free (struct nf_conn *tmpl) +void nf_ct_tmpl_free (struct nf_conn *tmpl) {nf_ct_ext_destroy (tmpl);nf_ct_ext_free (tmpl);kfree (tmpl); } +EXPORT_SYMBOL_GPL (nf_ct_tmpl_free);static void destroy_conntrack (struct nf_conntrack *nfct)
net/netfilter/nf_synproxy_core.c +1 -1
@@ -378,7 +378,7 @@ static int __net_init synproxy_net_init(struct net *net) err3:free_percpu (snet->stats); err2: -nf_conntrack_free (ct); +nf_ct_tmpl_free (ct); err1:return err; }
net/netfilter/xt_CT.c +1 -1
@@ -233,7 +233,7 @@ out:return 0 ; err3: -nf_conntrack_free (ct); +nf_ct_tmpl_free (ct); err2:nf_ct_l3proto_module_put (par->family); err1:
Signature · 1 line
1.7.10.4