Commit e2a75007 authored by Florian Westphal's avatar Florian Westphal Committed by Pablo Neira Ayuso

netfilter: conntrack: destroy functions need to free queued packets

queued skbs might be using conntrack extensions that are being removed,
such as timeout.  This happens for skbs that have a skb->nfct in
unconfirmed state (i.e., not in hash table yet).

This is destructive, but there are only two use cases:
 - module removal (rare)
 - netns cleanup (most likely no conntracks exist, and if they do,
   they are removed anyway later on).
Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 84657984
...@@ -56,6 +56,8 @@ ...@@ -56,6 +56,8 @@
#include <net/netfilter/nf_nat_helper.h> #include <net/netfilter/nf_nat_helper.h>
#include <net/netns/hash.h> #include <net/netns/hash.h>
#include "nf_internals.h"
#define NF_CONNTRACK_VERSION "0.5.0" #define NF_CONNTRACK_VERSION "0.5.0"
int (*nfnetlink_parse_nat_setup_hook)(struct nf_conn *ct, int (*nfnetlink_parse_nat_setup_hook)(struct nf_conn *ct,
...@@ -1692,6 +1694,7 @@ void nf_ct_unconfirmed_destroy(struct net *net) ...@@ -1692,6 +1694,7 @@ void nf_ct_unconfirmed_destroy(struct net *net)
if (atomic_read(&net->ct.count) > 0) { if (atomic_read(&net->ct.count) > 0) {
__nf_ct_unconfirmed_destroy(net); __nf_ct_unconfirmed_destroy(net);
nf_queue_nf_hook_drop(net);
synchronize_net(); synchronize_net();
} }
} }
...@@ -1737,6 +1740,7 @@ nf_ct_iterate_destroy(int (*iter)(struct nf_conn *i, void *data), void *data) ...@@ -1737,6 +1740,7 @@ nf_ct_iterate_destroy(int (*iter)(struct nf_conn *i, void *data), void *data)
if (atomic_read(&net->ct.count) == 0) if (atomic_read(&net->ct.count) == 0)
continue; continue;
__nf_ct_unconfirmed_destroy(net); __nf_ct_unconfirmed_destroy(net);
nf_queue_nf_hook_drop(net);
} }
rtnl_unlock(); rtnl_unlock();
......
...@@ -109,6 +109,7 @@ unsigned int nf_queue_nf_hook_drop(struct net *net) ...@@ -109,6 +109,7 @@ unsigned int nf_queue_nf_hook_drop(struct net *net)
return count; return count;
} }
EXPORT_SYMBOL_GPL(nf_queue_nf_hook_drop);
static int __nf_queue(struct sk_buff *skb, const struct nf_hook_state *state, static int __nf_queue(struct sk_buff *skb, const struct nf_hook_state *state,
struct nf_hook_entry *hook_entry, unsigned int queuenum) struct nf_hook_entry *hook_entry, unsigned int queuenum)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment