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

Commit 18330c58 authored by David S. Miller's avatar David S. Miller
Browse files

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



Pablo Neira Ayuso says:

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

The following patchset contains Netfilter fixes for net:

1) Fix warnings suspicious rcu usage when handling base chain
   statistics, from Taehee Yoo.

2) Refetch pointer to tcp header from nf_ct_sack_adjust() since
   skb_make_writable() may reallocate data area, reported by Google
   folks patch from Florian.

3) Incorrect netlink nest end after previous cancellation from error
   path in ipset, from Pan Bian.

4) Use dst_hold_safe() from nf_xfrm_me_harder(), from Florian.

5) Use rb_link_node_rcu() for rcu-protected rbtree node in
   nf_conncount, from Taehee Yoo.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 9463b9a4 d4e7df16

include/linux/netfilter/nfnetlink.h

+0 −12
Original line number Diff line number Diff line
@@ -62,18 +62,6 @@ static inline bool lockdep_nfnl_is_held(__u8 subsys_id) 
}

#endif /* CONFIG_PROVE_LOCKING */



/*

 * nfnl_dereference - fetch RCU pointer when updates are prevented by subsys mutex

 *

 * @p: The pointer to read, prior to dereferencing

 * @ss: The nfnetlink subsystem ID

 *

 * Return the value of the specified RCU-protected pointer, but omit

 * the READ_ONCE(), because caller holds the NFNL subsystem mutex.

 */

#define nfnl_dereference(p, ss)					\

	rcu_dereference_protected(p, lockdep_nfnl_is_held(ss))



#define MODULE_ALIAS_NFNL_SUBSYS(subsys) \

	MODULE_ALIAS("nfnetlink-subsys-" __stringify(subsys))

net/netfilter/ipset/ip_set_list_set.c

+1 −1
Original line number Diff line number Diff line
@@ -531,8 +531,8 @@ list_set_list(const struct ip_set *set, 
		ret = -EMSGSIZE;

	} else {

		cb->args[IPSET_CB_ARG0] = i;

	}

		ipset_nest_end(skb, atd);

	}

out:

	rcu_read_unlock();

	return ret;

net/netfilter/nf_conncount.c

+1 −1
Original line number Diff line number Diff line
@@ -427,7 +427,7 @@ insert_tree(struct net *net, 
	count = 1;

	rbconn->list.count = count;



	rb_link_node(&rbconn->node, parent, rbnode);

	rb_link_node_rcu(&rbconn->node, parent, rbnode);

	rb_insert_color(&rbconn->node, root);

out_unlock:

	spin_unlock_bh(&nf_conncount_locks[hash % CONNCOUNT_LOCK_SLOTS]);

net/netfilter/nf_conntrack_seqadj.c

+4 −3
Original line number Diff line number Diff line
@@ -115,12 +115,12 @@ static void nf_ct_sack_block_adjust(struct sk_buff *skb, 
/* TCP SACK sequence number adjustment */

static unsigned int nf_ct_sack_adjust(struct sk_buff *skb,

				      unsigned int protoff,

				      struct tcphdr *tcph,

				      struct nf_conn *ct,

				      enum ip_conntrack_info ctinfo)

{

	unsigned int dir, optoff, optend;

	struct tcphdr *tcph = (void *)skb->data + protoff;

	struct nf_conn_seqadj *seqadj = nfct_seqadj(ct);

	unsigned int dir, optoff, optend;



	optoff = protoff + sizeof(struct tcphdr);

	optend = protoff + tcph->doff * 4;
@@ -128,6 +128,7 @@ static unsigned int nf_ct_sack_adjust(struct sk_buff *skb, 
	if (!skb_make_writable(skb, optend))

		return 0;



	tcph = (void *)skb->data + protoff;

	dir = CTINFO2DIR(ctinfo);



	while (optoff < optend) {
@@ -207,7 +208,7 @@ int nf_ct_seq_adjust(struct sk_buff *skb, 
		 ntohl(newack));

	tcph->ack_seq = newack;



	res = nf_ct_sack_adjust(skb, protoff, tcph, ct, ctinfo);

	res = nf_ct_sack_adjust(skb, protoff, ct, ctinfo);

out:

	spin_unlock_bh(&ct->lock);

net/netfilter/nf_nat_core.c

+2 −1
Original line number Diff line number Diff line
@@ -117,7 +117,8 @@ int nf_xfrm_me_harder(struct net *net, struct sk_buff *skb, unsigned int family) 
	dst = skb_dst(skb);

	if (dst->xfrm)

		dst = ((struct xfrm_dst *)dst)->route;

	dst_hold(dst);

	if (!dst_hold_safe(dst))

		return -EHOSTUNREACH;



	if (sk && !net_eq(net, sock_net(sk)))

		sk = NULL;