nf_queue: Put devs after calling handler
Subsystems (2)
PATCH 1/1 nf_queue: Put devs after calling handler
Put devs after calling handler.
If we put the devs before calling handler, the devs may disappear when the handler is running.
Signed-off-by Changli Gao <[email protected]>
----
include/net/netfilter/nf_queue.h | 4 ++++ net/netfilter/nf_queue.c | 36 +++++++++++++++--------------------- 2 files changed, 19 insertions(+), 21 deletions(-)
include/net/netfilter/nf_queue.h +4 -0
@@ -12,6 +12,10 @@ struct nf_queue_entry {unsigned int hook;struct net_device *indev;struct net_device *outdev; +#ifdef CONFIG_BRIDGE_NETFILTER +struct net_device *physindev; +struct net_device *physoutdev; +#endif int (*okfn)(struct sk_buff *); };
net/netfilter/nf_queue.c +15 -21
@@ -88,14 +88,10 @@ static void nf_queue_entry_release_refs(struct nf_queue_entry *entry)if (entry->outdev)dev_put (entry->outdev);#ifdef CONFIG_BRIDGE_NETFILTER -if (entry->skb->nf_bridge) { -struct nf_bridge_info *nf_bridge = entry->skb->nf_bridge; - -if (nf_bridge->physindev) -dev_put (nf_bridge->physindev); -if (nf_bridge->physoutdev) -dev_put (nf_bridge->physoutdev); - } +if (entry->physindev) +dev_put (entry->physindev); +if (entry->physoutdev) +dev_put (entry->physoutdev);#endif /* Drop reference to owner of hook which queued us. */ module_put (entry->elem->owner);
@@ -115,10 +111,6 @@ static int __nf_queue(struct sk_buff *skb, {int status;struct nf_queue_entry *entry =NULL ; -#ifdef CONFIG_BRIDGE_NETFILTER -struct net_device *physindev; -struct net_device *physoutdev; -#endif const struct nf_afinfo *afinfo;const struct nf_queue_handler *qh;
@@ -161,12 +153,15 @@ static int __nf_queue(struct sk_buff *skb,dev_hold (outdev);#ifdef CONFIG_BRIDGE_NETFILTER if (skb->nf_bridge) { - physindev = skb->nf_bridge->physindev; -if (physindev) -dev_hold (physindev); - physoutdev = skb->nf_bridge->physoutdev; -if (physoutdev) -dev_hold (physoutdev); + entry->physindev = skb->nf_bridge->physindev; +if (entry->physindev) +dev_hold (entry->physindev); + entry->physoutdev = skb->nf_bridge->physoutdev; +if (entry->physoutdev) +dev_hold (entry->physoutdev); + }else { + entry->physindev =NULL ; + entry->physoutdev =NULL ; }#endif afinfo->saveroute (skb, entry);
@@ -236,9 +231,6 @@ void nf_reinject(struct nf_queue_entry *entry, unsigned int verdict)const struct nf_afinfo *afinfo;rcu_read_lock (); - -nf_queue_entry_release_refs (entry); -/* Continue traversal iff userspace said ok... */ if (verdict ==NF_REPEAT ) { elem = elem->prev;
@@ -277,6 +269,8 @@ void nf_reinject(struct nf_queue_entry *entry, unsigned int verdict)kfree_skb (skb); }rcu_read_unlock (); + +nf_queue_entry_release_refs (entry);kfree (entry);return ; }
net/netfilter/nf_queue.c void nf_reinject(struct nf_queue_entry *entry, unsigned int verdict) · line 241
Quoted 11 lines · Changli Gao
Put devs after calling handler.
If we put the devs before calling handler, the devs may disappear when the handler is running.
net/netfilter/nf_queue.c +0
-3@@ -236,9 +231,6 @@ void nf_reinject(struct nf_queue_entry *entry, unsigned int verdict)const struct nf_afinfo *afinfo;rcu_read_lock (); - -nf_queue_entry_release_refs (entry); -
The devices won't disappear under rcu_read_lock().