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

Commit 7a773504 authored by Eric W. Biederman's avatar Eric W. Biederman Committed by David S. Miller
Browse files

netfilter: Pass net to nf_hook_thresh 



Signed-off-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b11b1f65

include/linux/netfilter.h

+7 −4
Original line number Diff line number Diff line
@@ -170,6 +170,7 @@ int nf_hook_slow(struct sk_buff *skb, struct nf_hook_state *state); 
 *	value indicates the packet has been consumed by the hook.

 */

static inline int nf_hook_thresh(u_int8_t pf, unsigned int hook,

				 struct net *net,

				 struct sock *sk,

				 struct sk_buff *skb,

				 struct net_device *indev,
@@ -177,7 +178,6 @@ static inline int nf_hook_thresh(u_int8_t pf, unsigned int hook, 
				 int (*okfn)(struct sock *, struct sk_buff *),

				 int thresh)

{

	struct net *net = dev_net(indev ? indev : outdev);

	struct list_head *hook_list = &net->nf.hooks[pf][hook];



	if (nf_hook_list_active(hook_list, pf, hook)) {
@@ -195,7 +195,8 @@ static inline int nf_hook(u_int8_t pf, unsigned int hook, struct sock *sk, 
			  struct net_device *outdev,

			  int (*okfn)(struct sock *, struct sk_buff *))

{

	return nf_hook_thresh(pf, hook, sk, skb, indev, outdev, okfn, INT_MIN);

	struct net *net = dev_net(indev ? indev : outdev);

	return nf_hook_thresh(pf, hook, net, sk, skb, indev, outdev, okfn, INT_MIN);

}

                   

/* Activate hook; either okfn or kfree_skb called, unless a hook
@@ -221,7 +222,8 @@ NF_HOOK_THRESH(uint8_t pf, unsigned int hook, struct sock *sk, 
	       struct net_device *out,

	       int (*okfn)(struct sock *, struct sk_buff *), int thresh)

{

	int ret = nf_hook_thresh(pf, hook, sk, skb, in, out, okfn, thresh);

	struct net *net = dev_net(in ? in : out);

	int ret = nf_hook_thresh(pf, hook, net, sk, skb, in, out, okfn, thresh);

	if (ret == 1)

		ret = okfn(sk, skb);

	return ret;
@@ -232,10 +234,11 @@ NF_HOOK_COND(uint8_t pf, unsigned int hook, struct sock *sk, 
	     struct sk_buff *skb, struct net_device *in, struct net_device *out,

	     int (*okfn)(struct sock *, struct sk_buff *), bool cond)

{

	struct net *net = dev_net(in ? in : out);

	int ret;



	if (!cond ||

	    ((ret = nf_hook_thresh(pf, hook, sk, skb, in, out, okfn, INT_MIN)) == 1))

	    ((ret = nf_hook_thresh(pf, hook, net, sk, skb, in, out, okfn, INT_MIN)) == 1))

		ret = okfn(sk, skb);

	return ret;

}