Commit a2df1648 authored by Jan Engelhardt's avatar Jan Engelhardt Committed by Patrick McHardy

netfilter: xtables: move extension arguments into compound structure (6/6)

This patch does this for target extensions' destroy functions.
Signed-off-by: default avatarJan Engelhardt <jengelh@medozas.de>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
parent af5d6dc2
...@@ -251,6 +251,12 @@ struct xt_tgchk_param { ...@@ -251,6 +251,12 @@ struct xt_tgchk_param {
unsigned int hook_mask; unsigned int hook_mask;
}; };
/* Target destructor parameters */
struct xt_tgdtor_param {
const struct xt_target *target;
void *targinfo;
};
struct xt_match struct xt_match
{ {
struct list_head list; struct list_head list;
...@@ -311,7 +317,7 @@ struct xt_target ...@@ -311,7 +317,7 @@ struct xt_target
bool (*checkentry)(const struct xt_tgchk_param *); bool (*checkentry)(const struct xt_tgchk_param *);
/* Called when entry of this type deleted. */ /* Called when entry of this type deleted. */
void (*destroy)(const struct xt_target *target, void *targinfo); void (*destroy)(const struct xt_tgdtor_param *);
/* Called when userspace align differs from kernel space one */ /* Called when userspace align differs from kernel space one */
void (*compat_from_user)(void *dst, void *src); void (*compat_from_user)(void *dst, void *src);
......
...@@ -581,18 +581,23 @@ ebt_cleanup_match(struct ebt_entry_match *m, unsigned int *i) ...@@ -581,18 +581,23 @@ ebt_cleanup_match(struct ebt_entry_match *m, unsigned int *i)
static inline int static inline int
ebt_cleanup_watcher(struct ebt_entry_watcher *w, unsigned int *i) ebt_cleanup_watcher(struct ebt_entry_watcher *w, unsigned int *i)
{ {
struct xt_tgdtor_param par;
if (i && (*i)-- == 0) if (i && (*i)-- == 0)
return 1; return 1;
if (w->u.watcher->destroy)
w->u.watcher->destroy(w->u.watcher, w->data);
module_put(w->u.watcher->me);
par.target = w->u.watcher;
par.targinfo = w->data;
if (par.target->destroy != NULL)
par.target->destroy(&par);
module_put(par.target->me);
return 0; return 0;
} }
static inline int static inline int
ebt_cleanup_entry(struct ebt_entry *e, unsigned int *cnt) ebt_cleanup_entry(struct ebt_entry *e, unsigned int *cnt)
{ {
struct xt_tgdtor_param par;
struct ebt_entry_target *t; struct ebt_entry_target *t;
if (e->bitmask == 0) if (e->bitmask == 0)
...@@ -603,10 +608,12 @@ ebt_cleanup_entry(struct ebt_entry *e, unsigned int *cnt) ...@@ -603,10 +608,12 @@ ebt_cleanup_entry(struct ebt_entry *e, unsigned int *cnt)
EBT_WATCHER_ITERATE(e, ebt_cleanup_watcher, NULL); EBT_WATCHER_ITERATE(e, ebt_cleanup_watcher, NULL);
EBT_MATCH_ITERATE(e, ebt_cleanup_match, NULL); EBT_MATCH_ITERATE(e, ebt_cleanup_match, NULL);
t = (struct ebt_entry_target *)(((char *)e) + e->target_offset); t = (struct ebt_entry_target *)(((char *)e) + e->target_offset);
if (t->u.target->destroy)
t->u.target->destroy(t->u.target, t->data);
module_put(t->u.target->me);
par.target = t->u.target;
par.targinfo = t->data;
if (par.target->destroy != NULL)
par.target->destroy(&par);
module_put(par.target->me);
return 0; return 0;
} }
......
...@@ -557,15 +557,18 @@ static inline int check_entry_size_and_hooks(struct arpt_entry *e, ...@@ -557,15 +557,18 @@ static inline int check_entry_size_and_hooks(struct arpt_entry *e,
static inline int cleanup_entry(struct arpt_entry *e, unsigned int *i) static inline int cleanup_entry(struct arpt_entry *e, unsigned int *i)
{ {
struct xt_tgdtor_param par;
struct arpt_entry_target *t; struct arpt_entry_target *t;
if (i && (*i)-- == 0) if (i && (*i)-- == 0)
return 1; return 1;
t = arpt_get_target(e); t = arpt_get_target(e);
if (t->u.kernel.target->destroy) par.target = t->u.kernel.target;
t->u.kernel.target->destroy(t->u.kernel.target, t->data); par.targinfo = t->data;
module_put(t->u.kernel.target->me); if (par.target->destroy != NULL)
par.target->destroy(&par);
module_put(par.target->me);
return 0; return 0;
} }
......
...@@ -768,6 +768,7 @@ check_entry_size_and_hooks(struct ipt_entry *e, ...@@ -768,6 +768,7 @@ check_entry_size_and_hooks(struct ipt_entry *e,
static int static int
cleanup_entry(struct ipt_entry *e, unsigned int *i) cleanup_entry(struct ipt_entry *e, unsigned int *i)
{ {
struct xt_tgdtor_param par;
struct ipt_entry_target *t; struct ipt_entry_target *t;
if (i && (*i)-- == 0) if (i && (*i)-- == 0)
...@@ -776,9 +777,12 @@ cleanup_entry(struct ipt_entry *e, unsigned int *i) ...@@ -776,9 +777,12 @@ cleanup_entry(struct ipt_entry *e, unsigned int *i)
/* Cleanup all matches */ /* Cleanup all matches */
IPT_MATCH_ITERATE(e, cleanup_match, NULL); IPT_MATCH_ITERATE(e, cleanup_match, NULL);
t = ipt_get_target(e); t = ipt_get_target(e);
if (t->u.kernel.target->destroy)
t->u.kernel.target->destroy(t->u.kernel.target, t->data); par.target = t->u.kernel.target;
module_put(t->u.kernel.target->me); par.targinfo = t->data;
if (par.target->destroy != NULL)
par.target->destroy(&par);
module_put(par.target->me);
return 0; return 0;
} }
......
...@@ -411,9 +411,9 @@ static bool clusterip_tg_check(const struct xt_tgchk_param *par) ...@@ -411,9 +411,9 @@ static bool clusterip_tg_check(const struct xt_tgchk_param *par)
} }
/* drop reference count of cluster config when rule is deleted */ /* drop reference count of cluster config when rule is deleted */
static void clusterip_tg_destroy(const struct xt_target *target, void *targinfo) static void clusterip_tg_destroy(const struct xt_tgdtor_param *par)
{ {
const struct ipt_clusterip_tgt_info *cipinfo = targinfo; const struct ipt_clusterip_tgt_info *cipinfo = par->targinfo;
/* if no more entries are referencing the config, remove it /* if no more entries are referencing the config, remove it
* from the list and destroy the proc entry */ * from the list and destroy the proc entry */
...@@ -421,7 +421,7 @@ static void clusterip_tg_destroy(const struct xt_target *target, void *targinfo) ...@@ -421,7 +421,7 @@ static void clusterip_tg_destroy(const struct xt_target *target, void *targinfo)
clusterip_config_put(cipinfo->config); clusterip_config_put(cipinfo->config);
nf_ct_l3proto_module_put(target->family); nf_ct_l3proto_module_put(par->target->family);
} }
#ifdef CONFIG_COMPAT #ifdef CONFIG_COMPAT
......
...@@ -793,6 +793,7 @@ check_entry_size_and_hooks(struct ip6t_entry *e, ...@@ -793,6 +793,7 @@ check_entry_size_and_hooks(struct ip6t_entry *e,
static int static int
cleanup_entry(struct ip6t_entry *e, unsigned int *i) cleanup_entry(struct ip6t_entry *e, unsigned int *i)
{ {
struct xt_tgdtor_param par;
struct ip6t_entry_target *t; struct ip6t_entry_target *t;
if (i && (*i)-- == 0) if (i && (*i)-- == 0)
...@@ -801,9 +802,12 @@ cleanup_entry(struct ip6t_entry *e, unsigned int *i) ...@@ -801,9 +802,12 @@ cleanup_entry(struct ip6t_entry *e, unsigned int *i)
/* Cleanup all matches */ /* Cleanup all matches */
IP6T_MATCH_ITERATE(e, cleanup_match, NULL); IP6T_MATCH_ITERATE(e, cleanup_match, NULL);
t = ip6t_get_target(e); t = ip6t_get_target(e);
if (t->u.kernel.target->destroy)
t->u.kernel.target->destroy(t->u.kernel.target, t->data); par.target = t->u.kernel.target;
module_put(t->u.kernel.target->me); par.targinfo = t->data;
if (par.target->destroy != NULL)
par.target->destroy(&par);
module_put(par.target->me);
return 0; return 0;
} }
......
...@@ -146,10 +146,9 @@ static bool connmark_tg_check(const struct xt_tgchk_param *par) ...@@ -146,10 +146,9 @@ static bool connmark_tg_check(const struct xt_tgchk_param *par)
return true; return true;
} }
static void static void connmark_tg_destroy(const struct xt_tgdtor_param *par)
connmark_tg_destroy(const struct xt_target *target, void *targinfo)
{ {
nf_ct_l3proto_module_put(target->family); nf_ct_l3proto_module_put(par->target->family);
} }
#ifdef CONFIG_COMPAT #ifdef CONFIG_COMPAT
......
...@@ -114,10 +114,9 @@ static bool connsecmark_tg_check(const struct xt_tgchk_param *par) ...@@ -114,10 +114,9 @@ static bool connsecmark_tg_check(const struct xt_tgchk_param *par)
return true; return true;
} }
static void static void connsecmark_tg_destroy(const struct xt_tgdtor_param *par)
connsecmark_tg_destroy(const struct xt_target *target, void *targinfo)
{ {
nf_ct_l3proto_module_put(target->family); nf_ct_l3proto_module_put(par->target->family);
} }
static struct xt_target connsecmark_tg_reg[] __read_mostly = { static struct xt_target connsecmark_tg_reg[] __read_mostly = {
......
...@@ -139,10 +139,9 @@ static bool xt_rateest_tg_checkentry(const struct xt_tgchk_param *par) ...@@ -139,10 +139,9 @@ static bool xt_rateest_tg_checkentry(const struct xt_tgchk_param *par)
return false; return false;
} }
static void xt_rateest_tg_destroy(const struct xt_target *target, static void xt_rateest_tg_destroy(const struct xt_tgdtor_param *par)
void *targinfo)
{ {
struct xt_rateest_target_info *info = targinfo; struct xt_rateest_target_info *info = par->targinfo;
xt_rateest_put(info->est); xt_rateest_put(info->est);
} }
......
...@@ -113,7 +113,7 @@ static bool secmark_tg_check(const struct xt_tgchk_param *par) ...@@ -113,7 +113,7 @@ static bool secmark_tg_check(const struct xt_tgchk_param *par)
return true; return true;
} }
static void secmark_tg_destroy(const struct xt_target *target, void *targinfo) static void secmark_tg_destroy(const struct xt_tgdtor_param *par)
{ {
switch (mode) { switch (mode) {
case SECMARK_MODE_SEL: case SECMARK_MODE_SEL:
......
...@@ -67,9 +67,13 @@ static int ipt_init_target(struct ipt_entry_target *t, char *table, unsigned int ...@@ -67,9 +67,13 @@ static int ipt_init_target(struct ipt_entry_target *t, char *table, unsigned int
static void ipt_destroy_target(struct ipt_entry_target *t) static void ipt_destroy_target(struct ipt_entry_target *t)
{ {
if (t->u.kernel.target->destroy) struct xt_tgdtor_param par = {
t->u.kernel.target->destroy(t->u.kernel.target, t->data); .target = t->u.kernel.target,
module_put(t->u.kernel.target->me); .targinfo = t->data,
};
if (par.target->destroy != NULL)
par.target->destroy(&par);
module_put(par.target->me);
} }
static int tcf_ipt_release(struct tcf_ipt *ipt, int bind) static int tcf_ipt_release(struct tcf_ipt *ipt, int bind)
......
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