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

Commit 9c55d3b5 authored by Florian Westphal's avatar Florian Westphal Committed by Pablo Neira Ayuso
Browse files

nfnetlink: add nfnl_dereference_protected helper 



to avoid overly long line in followup patch.

Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent c38c4597

net/netfilter/nfnetlink.c

+7 −6
Original line number Diff line number Diff line
@@ -33,6 +33,10 @@ MODULE_LICENSE("GPL"); 
MODULE_AUTHOR("Harald Welte <laforge@netfilter.org>");

MODULE_ALIAS_NET_PF_PROTO(PF_NETLINK, NETLINK_NETFILTER);



#define nfnl_dereference_protected(id) \

	rcu_dereference_protected(table[(id)].subsys, \

				  lockdep_nfnl_is_held((id)))



static char __initdata nfversion[] = "0.30";



static struct {
@@ -208,8 +212,7 @@ static int nfnetlink_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh) 
		} else {

			rcu_read_unlock();

			nfnl_lock(subsys_id);

			if (rcu_dereference_protected(table[subsys_id].subsys,

				lockdep_is_held(&table[subsys_id].mutex)) != ss ||

			if (nfnl_dereference_protected(subsys_id) != ss ||

			    nfnetlink_find_client(type, ss) != nc)

				err = -EAGAIN;

			else if (nc->call)
@@ -299,15 +302,13 @@ static void nfnetlink_rcv_batch(struct sk_buff *skb, struct nlmsghdr *nlh, 
	skb->sk = oskb->sk;



	nfnl_lock(subsys_id);

	ss = rcu_dereference_protected(table[subsys_id].subsys,

				       lockdep_is_held(&table[subsys_id].mutex));

	ss = nfnl_dereference_protected(subsys_id);

	if (!ss) {

#ifdef CONFIG_MODULES

		nfnl_unlock(subsys_id);

		request_module("nfnetlink-subsys-%d", subsys_id);

		nfnl_lock(subsys_id);

		ss = rcu_dereference_protected(table[subsys_id].subsys,

					       lockdep_is_held(&table[subsys_id].mutex));

		ss = nfnl_dereference_protected(subsys_id);

		if (!ss)

#endif

		{