Skip to content

Commit

Permalink
xt_hashlimit: allocate a copy of name explicitly, don't rely on procf…
Browse files Browse the repository at this point in the history
…s guts

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
  • Loading branch information
Al Viro committed Apr 29, 2013
1 parent 89b107a commit 14b872f
Showing 1 changed file with 11 additions and 3 deletions.
14 changes: 11 additions & 3 deletions net/netfilter/xt_hashlimit.c
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ struct xt_hashlimit_htable {

/* seq_file stuff */
struct proc_dir_entry *pde;
const char *name;
struct net *net;

struct hlist_head hash[0]; /* hashtable itself */
Expand Down Expand Up @@ -253,13 +254,19 @@ static int htable_create(struct net *net, struct xt_hashlimit_mtinfo1 *minfo,
hinfo->count = 0;
hinfo->family = family;
hinfo->rnd_initialized = false;
hinfo->name = kstrdup(minfo->name, GFP_KERNEL);
if (!hinfo->name) {
vfree(hinfo);
return -ENOMEM;
}
spin_lock_init(&hinfo->lock);

hinfo->pde = proc_create_data(minfo->name, 0,
(family == NFPROTO_IPV4) ?
hashlimit_net->ipt_hashlimit : hashlimit_net->ip6t_hashlimit,
&dl_file_ops, hinfo);
if (hinfo->pde == NULL) {
kfree(hinfo->name);
vfree(hinfo);
return -ENOMEM;
}
Expand Down Expand Up @@ -330,9 +337,10 @@ static void htable_destroy(struct xt_hashlimit_htable *hinfo)
parent = hashlimit_net->ip6t_hashlimit;

if(parent != NULL)
remove_proc_entry(hinfo->pde->name, parent);
remove_proc_entry(hinfo->name, parent);

htable_selective_cleanup(hinfo, select_all);
kfree(hinfo->name);
vfree(hinfo);
}

Expand All @@ -344,7 +352,7 @@ static struct xt_hashlimit_htable *htable_find_get(struct net *net,
struct xt_hashlimit_htable *hinfo;

hlist_for_each_entry(hinfo, &hashlimit_net->htables, node) {
if (!strcmp(name, hinfo->pde->name) &&
if (!strcmp(name, hinfo->name) &&
hinfo->family == family) {
hinfo->use++;
return hinfo;
Expand Down Expand Up @@ -887,7 +895,7 @@ static void __net_exit hashlimit_proc_net_exit(struct net *net)
pde = hashlimit_net->ip6t_hashlimit;

hlist_for_each_entry(hinfo, &hashlimit_net->htables, node)
remove_proc_entry(hinfo->pde->name, pde);
remove_proc_entry(hinfo->name, pde);

hashlimit_net->ipt_hashlimit = NULL;
hashlimit_net->ip6t_hashlimit = NULL;
Expand Down

0 comments on commit 14b872f

Please sign in to comment.