Commit d69f93d0 authored by Florian Westphal's avatar Florian Westphal Committed by Greg Kroah-Hartman

netfilter: x_tables: do compat validation via translate_table

commit 09d96860 upstream.

This looks like refactoring, but its also a bug fix.

Problem is that the compat path (32bit iptables, 64bit kernel) lacks a few
sanity tests that are done in the normal path.

For example, we do not check for underflows and the base chain policies.

While its possible to also add such checks to the compat path, its more
copy&pastry, for instance we cannot reuse check_underflow() helper as
e->target_offset differs in the compat case.

Other problem is that it makes auditing for validation errors harder; two
places need to be checked and kept in sync.

At a high level 32 bit compat works like this:
1- initial pass over blob:
   validate match/entry offsets, bounds checking
   lookup all matches and targets
   do bookkeeping wrt. size delta of 32/64bit structures
   assign match/target.u.kernel pointer (points at kernel
   implementation, needed to access ->compatsize etc.)

2- allocate memory according to the total bookkeeping size to
   contain the translated ruleset

3- second pass over original blob:
   for each entry, copy the 32bit representation to the newly allocated
   memory.  This also does any special match translations (e.g.
   adjust 32bit to 64bit longs, etc).

4- check if ruleset is free of loops (chase all jumps)

5-first pass over translated blob:
   call the checkentry function of all matches and targets.

The alternative implemented by this patch is to drop steps 3&4 from the
compat process, the translation is changed into an intermediate step
rather than a full 1:1 translate_table replacement.

In the 2nd pass (step #3), change the 64bit ruleset back to a kernel
representation, i.e. put() the kernel pointer and restore ->u.user.name .

This gets us a 64bit ruleset that is in the format generated by a 64bit
iptables userspace -- we can then use translate_table() to get the
'native' sanity checks.

This has two drawbacks:

1. we re-validate all the match and target entry structure sizes even
though compat translation is supposed to never generate bogus offsets.
2. we put and then re-lookup each match and target.

THe upside is that we get all sanity tests and ruleset validations
provided by the normal path and can remove some duplicated compat code.

iptables-restore time of autogenerated ruleset with 300k chains of form
-A CHAIN0001 -m limit --limit 1/s -j CHAIN0002
-A CHAIN0002 -m limit --limit 1/s -j CHAIN0003

shows no noticeable differences in restore times:
old:   0m30.796s
new:   0m31.521s
64bit: 0m25.674s
Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3a69c0f0
...@@ -1233,19 +1233,17 @@ static inline void compat_release_entry(struct compat_arpt_entry *e) ...@@ -1233,19 +1233,17 @@ static inline void compat_release_entry(struct compat_arpt_entry *e)
module_put(t->u.kernel.target->me); module_put(t->u.kernel.target->me);
} }
static inline int static int
check_compat_entry_size_and_hooks(struct compat_arpt_entry *e, check_compat_entry_size_and_hooks(struct compat_arpt_entry *e,
struct xt_table_info *newinfo, struct xt_table_info *newinfo,
unsigned int *size, unsigned int *size,
const unsigned char *base, const unsigned char *base,
const unsigned char *limit, const unsigned char *limit)
const unsigned int *hook_entries,
const unsigned int *underflows)
{ {
struct xt_entry_target *t; struct xt_entry_target *t;
struct xt_target *target; struct xt_target *target;
unsigned int entry_offset; unsigned int entry_offset;
int ret, off, h; int ret, off;
duprintf("check_compat_entry_size_and_hooks %p\n", e); duprintf("check_compat_entry_size_and_hooks %p\n", e);
if ((unsigned long)e % __alignof__(struct compat_arpt_entry) != 0 || if ((unsigned long)e % __alignof__(struct compat_arpt_entry) != 0 ||
...@@ -1290,17 +1288,6 @@ check_compat_entry_size_and_hooks(struct compat_arpt_entry *e, ...@@ -1290,17 +1288,6 @@ check_compat_entry_size_and_hooks(struct compat_arpt_entry *e,
if (ret) if (ret)
goto release_target; goto release_target;
/* Check hooks & underflows */
for (h = 0; h < NF_ARP_NUMHOOKS; h++) {
if ((unsigned char *)e - base == hook_entries[h])
newinfo->hook_entry[h] = hook_entries[h];
if ((unsigned char *)e - base == underflows[h])
newinfo->underflow[h] = underflows[h];
}
/* Clear counters and comefrom */
memset(&e->counters, 0, sizeof(e->counters));
e->comefrom = 0;
return 0; return 0;
release_target: release_target:
...@@ -1350,7 +1337,7 @@ static int translate_compat_table(struct xt_table_info **pinfo, ...@@ -1350,7 +1337,7 @@ static int translate_compat_table(struct xt_table_info **pinfo,
struct xt_table_info *newinfo, *info; struct xt_table_info *newinfo, *info;
void *pos, *entry0, *entry1; void *pos, *entry0, *entry1;
struct compat_arpt_entry *iter0; struct compat_arpt_entry *iter0;
struct arpt_entry *iter1; struct arpt_replace repl;
unsigned int size; unsigned int size;
int ret = 0; int ret = 0;
...@@ -1359,12 +1346,6 @@ static int translate_compat_table(struct xt_table_info **pinfo, ...@@ -1359,12 +1346,6 @@ static int translate_compat_table(struct xt_table_info **pinfo,
size = compatr->size; size = compatr->size;
info->number = compatr->num_entries; info->number = compatr->num_entries;
/* Init all hooks to impossible value. */
for (i = 0; i < NF_ARP_NUMHOOKS; i++) {
info->hook_entry[i] = 0xFFFFFFFF;
info->underflow[i] = 0xFFFFFFFF;
}
duprintf("translate_compat_table: size %u\n", info->size); duprintf("translate_compat_table: size %u\n", info->size);
j = 0; j = 0;
xt_compat_lock(NFPROTO_ARP); xt_compat_lock(NFPROTO_ARP);
...@@ -1373,9 +1354,7 @@ static int translate_compat_table(struct xt_table_info **pinfo, ...@@ -1373,9 +1354,7 @@ static int translate_compat_table(struct xt_table_info **pinfo,
xt_entry_foreach(iter0, entry0, compatr->size) { xt_entry_foreach(iter0, entry0, compatr->size) {
ret = check_compat_entry_size_and_hooks(iter0, info, &size, ret = check_compat_entry_size_and_hooks(iter0, info, &size,
entry0, entry0,
entry0 + compatr->size, entry0 + compatr->size);
compatr->hook_entry,
compatr->underflow);
if (ret != 0) if (ret != 0)
goto out_unlock; goto out_unlock;
++j; ++j;
...@@ -1388,23 +1367,6 @@ static int translate_compat_table(struct xt_table_info **pinfo, ...@@ -1388,23 +1367,6 @@ static int translate_compat_table(struct xt_table_info **pinfo,
goto out_unlock; goto out_unlock;
} }
/* Check hooks all assigned */
for (i = 0; i < NF_ARP_NUMHOOKS; i++) {
/* Only hooks which are valid */
if (!(compatr->valid_hooks & (1 << i)))
continue;
if (info->hook_entry[i] == 0xFFFFFFFF) {
duprintf("Invalid hook entry %u %u\n",
i, info->hook_entry[i]);
goto out_unlock;
}
if (info->underflow[i] == 0xFFFFFFFF) {
duprintf("Invalid underflow %u %u\n",
i, info->underflow[i]);
goto out_unlock;
}
}
ret = -ENOMEM; ret = -ENOMEM;
newinfo = xt_alloc_table_info(size); newinfo = xt_alloc_table_info(size);
if (!newinfo) if (!newinfo)
...@@ -1421,55 +1383,26 @@ static int translate_compat_table(struct xt_table_info **pinfo, ...@@ -1421,55 +1383,26 @@ static int translate_compat_table(struct xt_table_info **pinfo,
xt_entry_foreach(iter0, entry0, compatr->size) xt_entry_foreach(iter0, entry0, compatr->size)
compat_copy_entry_from_user(iter0, &pos, &size, compat_copy_entry_from_user(iter0, &pos, &size,
newinfo, entry1); newinfo, entry1);
/* all module references in entry0 are now gone */
xt_compat_flush_offsets(NFPROTO_ARP); xt_compat_flush_offsets(NFPROTO_ARP);
xt_compat_unlock(NFPROTO_ARP); xt_compat_unlock(NFPROTO_ARP);
ret = -ELOOP; memcpy(&repl, compatr, sizeof(*compatr));
if (!mark_source_chains(newinfo, compatr->valid_hooks, entry1))
goto free_newinfo;
i = 0;
xt_entry_foreach(iter1, entry1, newinfo->size) {
iter1->counters.pcnt = xt_percpu_counter_alloc();
if (IS_ERR_VALUE(iter1->counters.pcnt)) {
ret = -ENOMEM;
break;
}
ret = check_target(iter1, compatr->name); for (i = 0; i < NF_ARP_NUMHOOKS; i++) {
if (ret != 0) { repl.hook_entry[i] = newinfo->hook_entry[i];
xt_percpu_counter_free(iter1->counters.pcnt); repl.underflow[i] = newinfo->underflow[i];
break;
}
++i;
if (strcmp(arpt_get_target(iter1)->u.user.name,
XT_ERROR_TARGET) == 0)
++newinfo->stacksize;
}
if (ret) {
/*
* The first i matches need cleanup_entry (calls ->destroy)
* because they had called ->check already. The other j-i
* entries need only release.
*/
int skip = i;
j -= i;
xt_entry_foreach(iter0, entry0, newinfo->size) {
if (skip-- > 0)
continue;
if (j-- == 0)
break;
compat_release_entry(iter0);
}
xt_entry_foreach(iter1, entry1, newinfo->size) {
if (i-- == 0)
break;
cleanup_entry(iter1);
}
xt_free_table_info(newinfo);
return ret;
} }
repl.num_counters = 0;
repl.counters = NULL;
repl.size = newinfo->size;
ret = translate_table(newinfo, entry1, &repl);
if (ret)
goto free_newinfo;
*pinfo = newinfo; *pinfo = newinfo;
*pentry0 = entry1; *pentry0 = entry1;
xt_free_table_info(info); xt_free_table_info(info);
...@@ -1477,17 +1410,16 @@ static int translate_compat_table(struct xt_table_info **pinfo, ...@@ -1477,17 +1410,16 @@ static int translate_compat_table(struct xt_table_info **pinfo,
free_newinfo: free_newinfo:
xt_free_table_info(newinfo); xt_free_table_info(newinfo);
out: return ret;
out_unlock:
xt_compat_flush_offsets(NFPROTO_ARP);
xt_compat_unlock(NFPROTO_ARP);
xt_entry_foreach(iter0, entry0, compatr->size) { xt_entry_foreach(iter0, entry0, compatr->size) {
if (j-- == 0) if (j-- == 0)
break; break;
compat_release_entry(iter0); compat_release_entry(iter0);
} }
return ret; return ret;
out_unlock:
xt_compat_flush_offsets(NFPROTO_ARP);
xt_compat_unlock(NFPROTO_ARP);
goto out;
} }
static int compat_do_replace(struct net *net, void __user *user, static int compat_do_replace(struct net *net, void __user *user,
......
...@@ -1482,16 +1482,14 @@ check_compat_entry_size_and_hooks(struct compat_ipt_entry *e, ...@@ -1482,16 +1482,14 @@ check_compat_entry_size_and_hooks(struct compat_ipt_entry *e,
struct xt_table_info *newinfo, struct xt_table_info *newinfo,
unsigned int *size, unsigned int *size,
const unsigned char *base, const unsigned char *base,
const unsigned char *limit, const unsigned char *limit)
const unsigned int *hook_entries,
const unsigned int *underflows)
{ {
struct xt_entry_match *ematch; struct xt_entry_match *ematch;
struct xt_entry_target *t; struct xt_entry_target *t;
struct xt_target *target; struct xt_target *target;
unsigned int entry_offset; unsigned int entry_offset;
unsigned int j; unsigned int j;
int ret, off, h; int ret, off;
duprintf("check_compat_entry_size_and_hooks %p\n", e); duprintf("check_compat_entry_size_and_hooks %p\n", e);
if ((unsigned long)e % __alignof__(struct compat_ipt_entry) != 0 || if ((unsigned long)e % __alignof__(struct compat_ipt_entry) != 0 ||
...@@ -1543,17 +1541,6 @@ check_compat_entry_size_and_hooks(struct compat_ipt_entry *e, ...@@ -1543,17 +1541,6 @@ check_compat_entry_size_and_hooks(struct compat_ipt_entry *e,
if (ret) if (ret)
goto out; goto out;
/* Check hooks & underflows */
for (h = 0; h < NF_INET_NUMHOOKS; h++) {
if ((unsigned char *)e - base == hook_entries[h])
newinfo->hook_entry[h] = hook_entries[h];
if ((unsigned char *)e - base == underflows[h])
newinfo->underflow[h] = underflows[h];
}
/* Clear counters and comefrom */
memset(&e->counters, 0, sizeof(e->counters));
e->comefrom = 0;
return 0; return 0;
out: out:
...@@ -1596,6 +1583,7 @@ compat_copy_entry_from_user(struct compat_ipt_entry *e, void **dstptr, ...@@ -1596,6 +1583,7 @@ compat_copy_entry_from_user(struct compat_ipt_entry *e, void **dstptr,
xt_compat_target_from_user(t, dstptr, size); xt_compat_target_from_user(t, dstptr, size);
de->next_offset = e->next_offset - (origsize - *size); de->next_offset = e->next_offset - (origsize - *size);
for (h = 0; h < NF_INET_NUMHOOKS; h++) { for (h = 0; h < NF_INET_NUMHOOKS; h++) {
if ((unsigned char *)de - base < newinfo->hook_entry[h]) if ((unsigned char *)de - base < newinfo->hook_entry[h])
newinfo->hook_entry[h] -= origsize - *size; newinfo->hook_entry[h] -= origsize - *size;
...@@ -1604,48 +1592,6 @@ compat_copy_entry_from_user(struct compat_ipt_entry *e, void **dstptr, ...@@ -1604,48 +1592,6 @@ compat_copy_entry_from_user(struct compat_ipt_entry *e, void **dstptr,
} }
} }
static int
compat_check_entry(struct ipt_entry *e, struct net *net, const char *name)
{
struct xt_entry_match *ematch;
struct xt_mtchk_param mtpar;
unsigned int j;
int ret = 0;
e->counters.pcnt = xt_percpu_counter_alloc();
if (IS_ERR_VALUE(e->counters.pcnt))
return -ENOMEM;
j = 0;
mtpar.net = net;
mtpar.table = name;
mtpar.entryinfo = &e->ip;
mtpar.hook_mask = e->comefrom;
mtpar.family = NFPROTO_IPV4;
xt_ematch_foreach(ematch, e) {
ret = check_match(ematch, &mtpar);
if (ret != 0)
goto cleanup_matches;
++j;
}
ret = check_target(e, net, name);
if (ret)
goto cleanup_matches;
return 0;
cleanup_matches:
xt_ematch_foreach(ematch, e) {
if (j-- == 0)
break;
cleanup_match(ematch, net);
}
xt_percpu_counter_free(e->counters.pcnt);
return ret;
}
static int static int
translate_compat_table(struct net *net, translate_compat_table(struct net *net,
struct xt_table_info **pinfo, struct xt_table_info **pinfo,
...@@ -1656,7 +1602,7 @@ translate_compat_table(struct net *net, ...@@ -1656,7 +1602,7 @@ translate_compat_table(struct net *net,
struct xt_table_info *newinfo, *info; struct xt_table_info *newinfo, *info;
void *pos, *entry0, *entry1; void *pos, *entry0, *entry1;
struct compat_ipt_entry *iter0; struct compat_ipt_entry *iter0;
struct ipt_entry *iter1; struct ipt_replace repl;
unsigned int size; unsigned int size;
int ret; int ret;
...@@ -1665,12 +1611,6 @@ translate_compat_table(struct net *net, ...@@ -1665,12 +1611,6 @@ translate_compat_table(struct net *net,
size = compatr->size; size = compatr->size;
info->number = compatr->num_entries; info->number = compatr->num_entries;
/* Init all hooks to impossible value. */
for (i = 0; i < NF_INET_NUMHOOKS; i++) {
info->hook_entry[i] = 0xFFFFFFFF;
info->underflow[i] = 0xFFFFFFFF;
}
duprintf("translate_compat_table: size %u\n", info->size); duprintf("translate_compat_table: size %u\n", info->size);
j = 0; j = 0;
xt_compat_lock(AF_INET); xt_compat_lock(AF_INET);
...@@ -1679,9 +1619,7 @@ translate_compat_table(struct net *net, ...@@ -1679,9 +1619,7 @@ translate_compat_table(struct net *net,
xt_entry_foreach(iter0, entry0, compatr->size) { xt_entry_foreach(iter0, entry0, compatr->size) {
ret = check_compat_entry_size_and_hooks(iter0, info, &size, ret = check_compat_entry_size_and_hooks(iter0, info, &size,
entry0, entry0,
entry0 + compatr->size, entry0 + compatr->size);
compatr->hook_entry,
compatr->underflow);
if (ret != 0) if (ret != 0)
goto out_unlock; goto out_unlock;
++j; ++j;
...@@ -1694,23 +1632,6 @@ translate_compat_table(struct net *net, ...@@ -1694,23 +1632,6 @@ translate_compat_table(struct net *net,
goto out_unlock; goto out_unlock;
} }
/* Check hooks all assigned */
for (i = 0; i < NF_INET_NUMHOOKS; i++) {
/* Only hooks which are valid */
if (!(compatr->valid_hooks & (1 << i)))
continue;
if (info->hook_entry[i] == 0xFFFFFFFF) {
duprintf("Invalid hook entry %u %u\n",
i, info->hook_entry[i]);
goto out_unlock;
}
if (info->underflow[i] == 0xFFFFFFFF) {
duprintf("Invalid underflow %u %u\n",
i, info->underflow[i]);
goto out_unlock;
}
}
ret = -ENOMEM; ret = -ENOMEM;
newinfo = xt_alloc_table_info(size); newinfo = xt_alloc_table_info(size);
if (!newinfo) if (!newinfo)
...@@ -1718,8 +1639,8 @@ translate_compat_table(struct net *net, ...@@ -1718,8 +1639,8 @@ translate_compat_table(struct net *net,
newinfo->number = compatr->num_entries; newinfo->number = compatr->num_entries;
for (i = 0; i < NF_INET_NUMHOOKS; i++) { for (i = 0; i < NF_INET_NUMHOOKS; i++) {
newinfo->hook_entry[i] = info->hook_entry[i]; newinfo->hook_entry[i] = compatr->hook_entry[i];
newinfo->underflow[i] = info->underflow[i]; newinfo->underflow[i] = compatr->underflow[i];
} }
entry1 = newinfo->entries; entry1 = newinfo->entries;
pos = entry1; pos = entry1;
...@@ -1728,47 +1649,30 @@ translate_compat_table(struct net *net, ...@@ -1728,47 +1649,30 @@ translate_compat_table(struct net *net,
compat_copy_entry_from_user(iter0, &pos, &size, compat_copy_entry_from_user(iter0, &pos, &size,
newinfo, entry1); newinfo, entry1);
/* all module references in entry0 are now gone.
* entry1/newinfo contains a 64bit ruleset that looks exactly as
* generated by 64bit userspace.
*
* Call standard translate_table() to validate all hook_entrys,
* underflows, check for loops, etc.
*/
xt_compat_flush_offsets(AF_INET); xt_compat_flush_offsets(AF_INET);
xt_compat_unlock(AF_INET); xt_compat_unlock(AF_INET);
ret = -ELOOP; memcpy(&repl, compatr, sizeof(*compatr));
if (!mark_source_chains(newinfo, compatr->valid_hooks, entry1))
goto free_newinfo;
i = 0; for (i = 0; i < NF_INET_NUMHOOKS; i++) {
xt_entry_foreach(iter1, entry1, newinfo->size) { repl.hook_entry[i] = newinfo->hook_entry[i];
ret = compat_check_entry(iter1, net, compatr->name); repl.underflow[i] = newinfo->underflow[i];
if (ret != 0)
break;
++i;
if (strcmp(ipt_get_target(iter1)->u.user.name,
XT_ERROR_TARGET) == 0)
++newinfo->stacksize;
}
if (ret) {
/*
* The first i matches need cleanup_entry (calls ->destroy)
* because they had called ->check already. The other j-i
* entries need only release.
*/
int skip = i;
j -= i;
xt_entry_foreach(iter0, entry0, newinfo->size) {
if (skip-- > 0)
continue;
if (j-- == 0)
break;
compat_release_entry(iter0);
}
xt_entry_foreach(iter1, entry1, newinfo->size) {
if (i-- == 0)
break;
cleanup_entry(iter1, net);
}
xt_free_table_info(newinfo);
return ret;
} }
repl.num_counters = 0;
repl.counters = NULL;
repl.size = newinfo->size;
ret = translate_table(net, newinfo, entry1, &repl);
if (ret)
goto free_newinfo;
*pinfo = newinfo; *pinfo = newinfo;
*pentry0 = entry1; *pentry0 = entry1;
xt_free_table_info(info); xt_free_table_info(info);
...@@ -1776,17 +1680,16 @@ translate_compat_table(struct net *net, ...@@ -1776,17 +1680,16 @@ translate_compat_table(struct net *net,
free_newinfo: free_newinfo:
xt_free_table_info(newinfo); xt_free_table_info(newinfo);
out: return ret;
out_unlock:
xt_compat_flush_offsets(AF_INET);
xt_compat_unlock(AF_INET);
xt_entry_foreach(iter0, entry0, compatr->size) { xt_entry_foreach(iter0, entry0, compatr->size) {
if (j-- == 0) if (j-- == 0)
break; break;
compat_release_entry(iter0); compat_release_entry(iter0);
} }
return ret; return ret;
out_unlock:
xt_compat_flush_offsets(AF_INET);
xt_compat_unlock(AF_INET);
goto out;
} }
static int static int
......
...@@ -1494,16 +1494,14 @@ check_compat_entry_size_and_hooks(struct compat_ip6t_entry *e, ...@@ -1494,16 +1494,14 @@ check_compat_entry_size_and_hooks(struct compat_ip6t_entry *e,
struct xt_table_info *newinfo, struct xt_table_info *newinfo,
unsigned int *size, unsigned int *size,
const unsigned char *base, const unsigned char *base,
const unsigned char *limit, const unsigned char *limit)
const unsigned int *hook_entries,
const unsigned int *underflows)
{ {
struct xt_entry_match *ematch; struct xt_entry_match *ematch;
struct xt_entry_target *t; struct xt_entry_target *t;
struct xt_target *target; struct xt_target *target;
unsigned int entry_offset; unsigned int entry_offset;
unsigned int j; unsigned int j;
int ret, off, h; int ret, off;
duprintf("check_compat_entry_size_and_hooks %p\n", e); duprintf("check_compat_entry_size_and_hooks %p\n", e);
if ((unsigned long)e % __alignof__(struct compat_ip6t_entry) != 0 || if ((unsigned long)e % __alignof__(struct compat_ip6t_entry) != 0 ||
...@@ -1555,17 +1553,6 @@ check_compat_entry_size_and_hooks(struct compat_ip6t_entry *e, ...@@ -1555,17 +1553,6 @@ check_compat_entry_size_and_hooks(struct compat_ip6t_entry *e,
if (ret) if (ret)
goto out; goto out;
/* Check hooks & underflows */
for (h = 0; h < NF_INET_NUMHOOKS; h++) {
if ((unsigned char *)e - base == hook_entries[h])
newinfo->hook_entry[h] = hook_entries[h];
if ((unsigned char *)e - base == underflows[h])
newinfo->underflow[h] = underflows[h];
}
/* Clear counters and comefrom */
memset(&e->counters, 0, sizeof(e->counters));
e->comefrom = 0;
return 0; return 0;
out: out:
...@@ -1614,47 +1601,6 @@ compat_copy_entry_from_user(struct compat_ip6t_entry *e, void **dstptr, ...@@ -1614,47 +1601,6 @@ compat_copy_entry_from_user(struct compat_ip6t_entry *e, void **dstptr,
} }
} }
static int compat_check_entry(struct ip6t_entry *e, struct net *net,
const char *name)
{
unsigned int j;
int ret = 0;
struct xt_mtchk_param mtpar;
struct xt_entry_match *ematch;
e->counters.pcnt = xt_percpu_counter_alloc();
if (IS_ERR_VALUE(e->counters.pcnt))
return -ENOMEM;
j = 0;
mtpar.net = net;
mtpar.table = name;
mtpar.entryinfo = &e->ipv6;
mtpar.hook_mask = e->comefrom;
mtpar.family = NFPROTO_IPV6;
xt_ematch_foreach(ematch, e) {
ret = check_match(ematch, &mtpar);
if (ret != 0)
goto cleanup_matches;
++j;
}
ret = check_target(e, net, name);
if (ret)
goto cleanup_matches;
return 0;
cleanup_matches:
xt_ematch_foreach(ematch, e) {
if (j-- == 0)
break;
cleanup_match(ematch, net);
}
xt_percpu_counter_free(e->counters.pcnt);
return ret;
}
static int static int
translate_compat_table(struct net *net, translate_compat_table(struct net *net,
struct xt_table_info **pinfo, struct xt_table_info **pinfo,
...@@ -1665,7 +1611,7 @@ translate_compat_table(struct net *net, ...@@ -1665,7 +1611,7 @@ translate_compat_table(struct net *net,
struct xt_table_info *newinfo, *info; struct xt_table_info *newinfo, *info;
void *pos, *entry0, *entry1; void *pos, *entry0, *entry1;
struct compat_ip6t_entry *iter0; struct compat_ip6t_entry *iter0;
struct ip6t_entry *iter1; struct ip6t_replace repl;
unsigned int size; unsigned int size;
int ret = 0; int ret = 0;
...@@ -1674,12 +1620,6 @@ translate_compat_table(struct net *net, ...@@ -1674,12 +1620,6 @@ translate_compat_table(struct net *net,
size = compatr->size; size = compatr->size;
info->number = compatr->num_entries; info->number = compatr->num_entries;
/* Init all hooks to impossible value. */
for (i = 0; i < NF_INET_NUMHOOKS; i++) {
info->hook_entry[i] = 0xFFFFFFFF;
info->underflow[i] = 0xFFFFFFFF;
}
duprintf("translate_compat_table: size %u\n", info->size); duprintf("translate_compat_table: size %u\n", info->size);
j = 0; j = 0;
xt_compat_lock(AF_INET6); xt_compat_lock(AF_INET6);
...@@ -1688,9 +1628,7 @@ translate_compat_table(struct net *net, ...@@ -1688,9 +1628,7 @@ translate_compat_table(struct net *net,
xt_entry_foreach(iter0, entry0, compatr->size) { xt_entry_foreach(iter0, entry0, compatr->size) {
ret = check_compat_entry_size_and_hooks(iter0, info, &size, ret = check_compat_entry_size_and_hooks(iter0, info, &size,
entry0, entry0,
entry0 + compatr->size, entry0 + compatr->size);
compatr->hook_entry,
compatr->underflow);
if (ret != 0) if (ret != 0)
goto out_unlock; goto out_unlock;
++j; ++j;
...@@ -1703,23 +1641,6 @@ translate_compat_table(struct net *net, ...@@ -1703,23 +1641,6 @@ translate_compat_table(struct net *net,
goto out_unlock; goto out_unlock;
} }
/* Check hooks all assigned */
for (i = 0; i < NF_INET_NUMHOOKS; i++) {
/* Only hooks which are valid */
if (!(compatr->valid_hooks & (1 << i)))
continue;
if (info->hook_entry[i] == 0xFFFFFFFF) {
duprintf("Invalid hook entry %u %u\n",
i, info->hook_entry[i]);
goto out_unlock;
}
if (info->underflow[i] == 0xFFFFFFFF) {
duprintf("Invalid underflow %u %u\n",
i, info->underflow[i]);
goto out_unlock;
}
}
ret = -ENOMEM; ret = -ENOMEM;
newinfo = xt_alloc_table_info(size); newinfo = xt_alloc_table_info(size);
if (!newinfo) if (!newinfo)
...@@ -1727,56 +1648,34 @@ translate_compat_table(struct net *net, ...@@ -1727,56 +1648,34 @@ translate_compat_table(struct net *net,
newinfo->number = compatr->num_entries; newinfo->number = compatr->num_entries;
for (i = 0; i < NF_INET_NUMHOOKS; i++) { for (i = 0; i < NF_INET_NUMHOOKS; i++) {
newinfo->hook_entry[i] = info->hook_entry[i]; newinfo->hook_entry[i] = compatr->hook_entry[i];
newinfo->underflow[i] = info->underflow[i]; newinfo->underflow[i] = compatr->underflow[i];
} }
entry1 = newinfo->entries; entry1 = newinfo->entries;
pos = entry1; pos = entry1;
size = compatr->size;
xt_entry_foreach(iter0, entry0, compatr->size) xt_entry_foreach(iter0, entry0, compatr->size)
compat_copy_entry_from_user(iter0, &pos, &size, compat_copy_entry_from_user(iter0, &pos, &size,
newinfo, entry1); newinfo, entry1);
/* all module references in entry0 are now gone. */
xt_compat_flush_offsets(AF_INET6); xt_compat_flush_offsets(AF_INET6);
xt_compat_unlock(AF_INET6); xt_compat_unlock(AF_INET6);
ret = -ELOOP; memcpy(&repl, compatr, sizeof(*compatr));
if (!mark_source_chains(newinfo, compatr->valid_hooks, entry1))
goto free_newinfo;
i = 0; for (i = 0; i < NF_INET_NUMHOOKS; i++) {
xt_entry_foreach(iter1, entry1, newinfo->size) { repl.hook_entry[i] = newinfo->hook_entry[i];
ret = compat_check_entry(iter1, net, compatr->name); repl.underflow[i] = newinfo->underflow[i];
if (ret != 0)
break;
++i;
if (strcmp(ip6t_get_target(iter1)->u.user.name,
XT_ERROR_TARGET) == 0)
++newinfo->stacksize;
}
if (ret) {
/*
* The first i matches need cleanup_entry (calls ->destroy)
* because they had called ->check already. The other j-i
* entries need only release.
*/
int skip = i;
j -= i;
xt_entry_foreach(iter0, entry0, newinfo->size) {
if (skip-- > 0)
continue;
if (j-- == 0)
break;
compat_release_entry(iter0);
}
xt_entry_foreach(iter1, entry1, newinfo->size) {
if (i-- == 0)
break;
cleanup_entry(iter1, net);
}
xt_free_table_info(newinfo);
return ret;
} }
repl.num_counters = 0;
repl.counters = NULL;
repl.size = newinfo->size;
ret = translate_table(net, newinfo, entry1, &repl);
if (ret)
goto free_newinfo;
*pinfo = newinfo; *pinfo = newinfo;
*pentry0 = entry1; *pentry0 = entry1;
xt_free_table_info(info); xt_free_table_info(info);
...@@ -1784,17 +1683,16 @@ translate_compat_table(struct net *net, ...@@ -1784,17 +1683,16 @@ translate_compat_table(struct net *net,
free_newinfo: free_newinfo:
xt_free_table_info(newinfo); xt_free_table_info(newinfo);
out: return ret;
out_unlock:
xt_compat_flush_offsets(AF_INET6);
xt_compat_unlock(AF_INET6);
xt_entry_foreach(iter0, entry0, compatr->size) { xt_entry_foreach(iter0, entry0, compatr->size) {
if (j-- == 0) if (j-- == 0)
break; break;
compat_release_entry(iter0); compat_release_entry(iter0);
} }
return ret; return ret;
out_unlock:
xt_compat_flush_offsets(AF_INET6);
xt_compat_unlock(AF_INET6);
goto out;
} }
static int static int
......
...@@ -532,6 +532,7 @@ void xt_compat_match_from_user(struct xt_entry_match *m, void **dstptr, ...@@ -532,6 +532,7 @@ void xt_compat_match_from_user(struct xt_entry_match *m, void **dstptr,
struct compat_xt_entry_match *cm = (struct compat_xt_entry_match *)m; struct compat_xt_entry_match *cm = (struct compat_xt_entry_match *)m;
int pad, off = xt_compat_match_offset(match); int pad, off = xt_compat_match_offset(match);
u_int16_t msize = cm->u.user.match_size; u_int16_t msize = cm->u.user.match_size;
char name[sizeof(m->u.user.name)];
m = *dstptr; m = *dstptr;
memcpy(m, cm, sizeof(*cm)); memcpy(m, cm, sizeof(*cm));
...@@ -545,6 +546,9 @@ void xt_compat_match_from_user(struct xt_entry_match *m, void **dstptr, ...@@ -545,6 +546,9 @@ void xt_compat_match_from_user(struct xt_entry_match *m, void **dstptr,
msize += off; msize += off;
m->u.user.match_size = msize; m->u.user.match_size = msize;
strlcpy(name, match->name, sizeof(name));
module_put(match->me);
strncpy(m->u.user.name, name, sizeof(m->u.user.name));
*size += off; *size += off;
*dstptr += msize; *dstptr += msize;
...@@ -762,6 +766,7 @@ void xt_compat_target_from_user(struct xt_entry_target *t, void **dstptr, ...@@ -762,6 +766,7 @@ void xt_compat_target_from_user(struct xt_entry_target *t, void **dstptr,
struct compat_xt_entry_target *ct = (struct compat_xt_entry_target *)t; struct compat_xt_entry_target *ct = (struct compat_xt_entry_target *)t;
int pad, off = xt_compat_target_offset(target); int pad, off = xt_compat_target_offset(target);
u_int16_t tsize = ct->u.user.target_size; u_int16_t tsize = ct->u.user.target_size;
char name[sizeof(t->u.user.name)];
t = *dstptr; t = *dstptr;
memcpy(t, ct, sizeof(*ct)); memcpy(t, ct, sizeof(*ct));
...@@ -775,6 +780,9 @@ void xt_compat_target_from_user(struct xt_entry_target *t, void **dstptr, ...@@ -775,6 +780,9 @@ void xt_compat_target_from_user(struct xt_entry_target *t, void **dstptr,
tsize += off; tsize += off;
t->u.user.target_size = tsize; t->u.user.target_size = tsize;
strlcpy(name, target->name, sizeof(name));
module_put(target->me);
strncpy(t->u.user.name, name, sizeof(t->u.user.name));
*size += off; *size += off;
*dstptr += tsize; *dstptr += tsize;
......
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