netfilter: conntrack: don't report events on module removal
During the module removal there are no possible event listeners since ctnetlink must be removed before to allow removing nf_conntrack. This patch removes the event reporting for the module removal case which is not of any use in the existing code. Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
This commit is contained in:
parent
03b64f518a
commit
274d383b9c
|
@ -203,7 +203,7 @@ __nf_conntrack_find(struct net *net, const struct nf_conntrack_tuple *tuple);
|
|||
|
||||
extern void nf_conntrack_hash_insert(struct nf_conn *ct);
|
||||
|
||||
extern void nf_conntrack_flush(struct net *net, u32 pid, int report);
|
||||
extern void nf_conntrack_flush_report(struct net *net, u32 pid, int report);
|
||||
|
||||
extern bool nf_ct_get_tuplepr(const struct sk_buff *skb,
|
||||
unsigned int nhoff, u_int16_t l3num,
|
||||
|
|
|
@ -1001,7 +1001,7 @@ struct __nf_ct_flush_report {
|
|||
int report;
|
||||
};
|
||||
|
||||
static int kill_all(struct nf_conn *i, void *data)
|
||||
static int kill_report(struct nf_conn *i, void *data)
|
||||
{
|
||||
struct __nf_ct_flush_report *fr = (struct __nf_ct_flush_report *)data;
|
||||
|
||||
|
@ -1013,6 +1013,11 @@ static int kill_all(struct nf_conn *i, void *data)
|
|||
return 1;
|
||||
}
|
||||
|
||||
static int kill_all(struct nf_conn *i, void *data)
|
||||
{
|
||||
return 1;
|
||||
}
|
||||
|
||||
void nf_ct_free_hashtable(void *hash, int vmalloced, unsigned int size)
|
||||
{
|
||||
if (vmalloced)
|
||||
|
@ -1023,15 +1028,15 @@ void nf_ct_free_hashtable(void *hash, int vmalloced, unsigned int size)
|
|||
}
|
||||
EXPORT_SYMBOL_GPL(nf_ct_free_hashtable);
|
||||
|
||||
void nf_conntrack_flush(struct net *net, u32 pid, int report)
|
||||
void nf_conntrack_flush_report(struct net *net, u32 pid, int report)
|
||||
{
|
||||
struct __nf_ct_flush_report fr = {
|
||||
.pid = pid,
|
||||
.report = report,
|
||||
};
|
||||
nf_ct_iterate_cleanup(net, kill_all, &fr);
|
||||
nf_ct_iterate_cleanup(net, kill_report, &fr);
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(nf_conntrack_flush);
|
||||
EXPORT_SYMBOL_GPL(nf_conntrack_flush_report);
|
||||
|
||||
static void nf_conntrack_cleanup_init_net(void)
|
||||
{
|
||||
|
@ -1045,7 +1050,7 @@ static void nf_conntrack_cleanup_net(struct net *net)
|
|||
nf_ct_event_cache_flush(net);
|
||||
nf_conntrack_ecache_fini(net);
|
||||
i_see_dead_people:
|
||||
nf_conntrack_flush(net, 0, 0);
|
||||
nf_ct_iterate_cleanup(net, kill_all, NULL);
|
||||
if (atomic_read(&net->ct.count) != 0) {
|
||||
schedule();
|
||||
goto i_see_dead_people;
|
||||
|
|
|
@ -777,7 +777,7 @@ ctnetlink_del_conntrack(struct sock *ctnl, struct sk_buff *skb,
|
|||
err = ctnetlink_parse_tuple(cda, &tuple, CTA_TUPLE_REPLY, u3);
|
||||
else {
|
||||
/* Flush the whole table */
|
||||
nf_conntrack_flush(&init_net,
|
||||
nf_conntrack_flush_report(&init_net,
|
||||
NETLINK_CB(skb).pid,
|
||||
nlmsg_report(nlh));
|
||||
return 0;
|
||||
|
|
Loading…
Reference in New Issue