Commit 1c984f8a authored by David Miller's avatar David Miller Committed by David S. Miller
Browse files

netfilter: Add socket pointer to nf_hook_state. 



It is currently always set to NULL, but nf_queue is adjusted to be
prepared for it being set to a real socket by taking and releasing a
reference to that socket when necessary.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 107a9f4d

include/linux/netfilter.h

+6 −1
Original line number Diff line number Diff line
@@ -45,12 +45,15 @@ struct sk_buff; 


struct nf_hook_ops;



struct sock;



struct nf_hook_state {

	unsigned int hook;

	int thresh;

	u_int8_t pf;

	struct net_device *in;

	struct net_device *out;

	struct sock *sk;

	int (*okfn)(struct sk_buff *);

};
@@ -59,6 +62,7 @@ static inline void nf_hook_state_init(struct nf_hook_state *p, 
				      int thresh, u_int8_t pf,

				      struct net_device *indev,

				      struct net_device *outdev,

				      struct sock *sk,

				      int (*okfn)(struct sk_buff *))

{

	p->hook = hook;
@@ -66,6 +70,7 @@ static inline void nf_hook_state_init(struct nf_hook_state *p, 
	p->pf = pf;

	p->in = indev;

	p->out = outdev;

	p->sk = sk;

	p->okfn = okfn;

}
@@ -160,7 +165,7 @@ static inline int nf_hook_thresh(u_int8_t pf, unsigned int hook, 
		struct nf_hook_state state;



		nf_hook_state_init(&state, hook, thresh, pf,

				   indev, outdev, okfn);

				   indev, outdev, NULL, okfn);

		return nf_hook_slow(skb, &state);

	}

	return 1;

net/netfilter/nf_queue.c

+4 −0
Original line number Diff line number Diff line
@@ -54,6 +54,8 @@ void nf_queue_entry_release_refs(struct nf_queue_entry *entry) 
		dev_put(state->in);

	if (state->out)

		dev_put(state->out);

	if (state->sk)

		sock_put(state->sk);

#if IS_ENABLED(CONFIG_BRIDGE_NETFILTER)

	if (entry->skb->nf_bridge) {

		struct nf_bridge_info *nf_bridge = entry->skb->nf_bridge;
@@ -81,6 +83,8 @@ bool nf_queue_entry_get_refs(struct nf_queue_entry *entry) 
		dev_hold(state->in);

	if (state->out)

		dev_hold(state->out);

	if (state->sk)

		sock_hold(state->sk);

#if IS_ENABLED(CONFIG_BRIDGE_NETFILTER)

	if (entry->skb->nf_bridge) {

		struct nf_bridge_info *nf_bridge = entry->skb->nf_bridge;