Commit 5220a525 authored by David S. Miller's avatar David S. Miller
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf 



Pablo Neira Ayuso says:

====================
Netfilter fixes for net

The following patchset contains Netfilter fixes for net:

1) Fix incorrect printing of memory size of IPVS connection hash table,
   from Pengcheng Yang.

2) Fix spurious EEXIST errors in nft_set_rbtree.

3) Remove leftover empty flowtable file, from  Rongguang Wei.

4) Fix ip6_route_me_harder() with vrf driver, from Martin Willi.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 165e3e17 8ddffdb9

net/ipv4/netfilter/nf_flow_table_ipv4.c

deleted100644 → 0
+0 −0

Empty file deleted.

net/ipv6/netfilter.c

+8 −2
Original line number Diff line number Diff line
@@ -24,14 +24,13 @@ int ip6_route_me_harder(struct net *net, struct sock *sk_partial, struct sk_buff 
{

	const struct ipv6hdr *iph = ipv6_hdr(skb);

	struct sock *sk = sk_to_full_sk(sk_partial);

	struct net_device *dev = skb_dst(skb)->dev;

	struct flow_keys flkeys;

	unsigned int hh_len;

	struct dst_entry *dst;

	int strict = (ipv6_addr_type(&iph->daddr) &

		      (IPV6_ADDR_MULTICAST | IPV6_ADDR_LINKLOCAL));

	struct flowi6 fl6 = {

		.flowi6_oif = sk && sk->sk_bound_dev_if ? sk->sk_bound_dev_if :

			strict ? skb_dst(skb)->dev->ifindex : 0,

		.flowi6_mark = skb->mark,

		.flowi6_uid = sock_net_uid(net, sk),

		.daddr = iph->daddr,
@@ -39,6 +38,13 @@ int ip6_route_me_harder(struct net *net, struct sock *sk_partial, struct sk_buff 
	};

	int err;



	if (sk && sk->sk_bound_dev_if)

		fl6.flowi6_oif = sk->sk_bound_dev_if;

	else if (strict)

		fl6.flowi6_oif = dev->ifindex;

	else

		fl6.flowi6_oif = l3mdev_master_ifindex(dev);



	fib6_rules_early_flow_dissect(net, skb, &fl6, &flkeys);

	dst = ip6_route_output(net, sk, &fl6);

	err = dst->error;

net/netfilter/ipvs/ip_vs_conn.c

+1 −1
Original line number Diff line number Diff line
@@ -1495,7 +1495,7 @@ int __init ip_vs_conn_init(void) 
	pr_info("Connection hash table configured "

		"(size=%d, memory=%ldKbytes)\n",

		ip_vs_conn_tab_size,

		(long)(ip_vs_conn_tab_size*sizeof(struct list_head))/1024);

		(long)(ip_vs_conn_tab_size*sizeof(*ip_vs_conn_tab))/1024);

	IP_VS_DBG(0, "Each connection entry needs %zd bytes at least\n",

		  sizeof(struct ip_vs_conn));

net/netfilter/nft_set_rbtree.c

+5 −1
Original line number Diff line number Diff line
@@ -349,7 +349,11 @@ static int __nft_rbtree_insert(const struct net *net, const struct nft_set *set, 
				*ext = &rbe->ext;

				return -EEXIST;

			} else {

				overlap = false;

				if (nft_rbtree_interval_end(rbe))

					p = &parent->rb_left;

				else

					p = &parent->rb_right;

			}

		}