netfilter: x_tables: xt_compat_match_from_user doesn't need a retval
commit 0188346f21e6546498c2a0f84888797ad4063fc5 upstream. Always returned 0. Signed-off-by: Florian Westphal <fw@strlen.de> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Florian Westphal
Greg Kroah-Hartman
parent
0fab6d3d18
commit
3a69c0f048
5 changed files with 26 additions and 51 deletions
|
|
@ -482,7 +482,7 @@ void xt_compat_init_offsets(u_int8_t af, unsigned int number);
|
|||
int xt_compat_calc_jump(u_int8_t af, unsigned int offset);
|
||||
|
||||
int xt_compat_match_offset(const struct xt_match *match);
|
||||
int xt_compat_match_from_user(struct xt_entry_match *m, void **dstptr,
|
||||
void xt_compat_match_from_user(struct xt_entry_match *m, void **dstptr,
|
||||
unsigned int *size);
|
||||
int xt_compat_match_to_user(const struct xt_entry_match *m,
|
||||
void __user **dstptr, unsigned int *size);
|
||||
|
|
|
|||
|
|
@ -1309,7 +1309,7 @@ out:
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int
|
||||
static void
|
||||
compat_copy_entry_from_user(struct compat_arpt_entry *e, void **dstptr,
|
||||
unsigned int *size,
|
||||
struct xt_table_info *newinfo, unsigned char *base)
|
||||
|
|
@ -1318,9 +1318,8 @@ compat_copy_entry_from_user(struct compat_arpt_entry *e, void **dstptr,
|
|||
struct xt_target *target;
|
||||
struct arpt_entry *de;
|
||||
unsigned int origsize;
|
||||
int ret, h;
|
||||
int h;
|
||||
|
||||
ret = 0;
|
||||
origsize = *size;
|
||||
de = (struct arpt_entry *)*dstptr;
|
||||
memcpy(de, e, sizeof(struct arpt_entry));
|
||||
|
|
@ -1341,7 +1340,6 @@ compat_copy_entry_from_user(struct compat_arpt_entry *e, void **dstptr,
|
|||
if ((unsigned char *)de - base < newinfo->underflow[h])
|
||||
newinfo->underflow[h] -= origsize - *size;
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int translate_compat_table(struct xt_table_info **pinfo,
|
||||
|
|
@ -1420,16 +1418,11 @@ static int translate_compat_table(struct xt_table_info **pinfo,
|
|||
entry1 = newinfo->entries;
|
||||
pos = entry1;
|
||||
size = compatr->size;
|
||||
xt_entry_foreach(iter0, entry0, compatr->size) {
|
||||
ret = compat_copy_entry_from_user(iter0, &pos, &size,
|
||||
newinfo, entry1);
|
||||
if (ret != 0)
|
||||
break;
|
||||
}
|
||||
xt_entry_foreach(iter0, entry0, compatr->size)
|
||||
compat_copy_entry_from_user(iter0, &pos, &size,
|
||||
newinfo, entry1);
|
||||
xt_compat_flush_offsets(NFPROTO_ARP);
|
||||
xt_compat_unlock(NFPROTO_ARP);
|
||||
if (ret)
|
||||
goto free_newinfo;
|
||||
|
||||
ret = -ELOOP;
|
||||
if (!mark_source_chains(newinfo, compatr->valid_hooks, entry1))
|
||||
|
|
|
|||
|
|
@ -1567,7 +1567,7 @@ release_matches:
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int
|
||||
static void
|
||||
compat_copy_entry_from_user(struct compat_ipt_entry *e, void **dstptr,
|
||||
unsigned int *size,
|
||||
struct xt_table_info *newinfo, unsigned char *base)
|
||||
|
|
@ -1576,10 +1576,9 @@ compat_copy_entry_from_user(struct compat_ipt_entry *e, void **dstptr,
|
|||
struct xt_target *target;
|
||||
struct ipt_entry *de;
|
||||
unsigned int origsize;
|
||||
int ret, h;
|
||||
int h;
|
||||
struct xt_entry_match *ematch;
|
||||
|
||||
ret = 0;
|
||||
origsize = *size;
|
||||
de = (struct ipt_entry *)*dstptr;
|
||||
memcpy(de, e, sizeof(struct ipt_entry));
|
||||
|
|
@ -1588,11 +1587,9 @@ compat_copy_entry_from_user(struct compat_ipt_entry *e, void **dstptr,
|
|||
*dstptr += sizeof(struct ipt_entry);
|
||||
*size += sizeof(struct ipt_entry) - sizeof(struct compat_ipt_entry);
|
||||
|
||||
xt_ematch_foreach(ematch, e) {
|
||||
ret = xt_compat_match_from_user(ematch, dstptr, size);
|
||||
if (ret != 0)
|
||||
return ret;
|
||||
}
|
||||
xt_ematch_foreach(ematch, e)
|
||||
xt_compat_match_from_user(ematch, dstptr, size);
|
||||
|
||||
de->target_offset = e->target_offset - (origsize - *size);
|
||||
t = compat_ipt_get_target(e);
|
||||
target = t->u.kernel.target;
|
||||
|
|
@ -1605,7 +1602,6 @@ compat_copy_entry_from_user(struct compat_ipt_entry *e, void **dstptr,
|
|||
if ((unsigned char *)de - base < newinfo->underflow[h])
|
||||
newinfo->underflow[h] -= origsize - *size;
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int
|
||||
|
|
@ -1728,16 +1724,12 @@ translate_compat_table(struct net *net,
|
|||
entry1 = newinfo->entries;
|
||||
pos = entry1;
|
||||
size = compatr->size;
|
||||
xt_entry_foreach(iter0, entry0, compatr->size) {
|
||||
ret = compat_copy_entry_from_user(iter0, &pos, &size,
|
||||
newinfo, entry1);
|
||||
if (ret != 0)
|
||||
break;
|
||||
}
|
||||
xt_entry_foreach(iter0, entry0, compatr->size)
|
||||
compat_copy_entry_from_user(iter0, &pos, &size,
|
||||
newinfo, entry1);
|
||||
|
||||
xt_compat_flush_offsets(AF_INET);
|
||||
xt_compat_unlock(AF_INET);
|
||||
if (ret)
|
||||
goto free_newinfo;
|
||||
|
||||
ret = -ELOOP;
|
||||
if (!mark_source_chains(newinfo, compatr->valid_hooks, entry1))
|
||||
|
|
|
|||
|
|
@ -1579,7 +1579,7 @@ release_matches:
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int
|
||||
static void
|
||||
compat_copy_entry_from_user(struct compat_ip6t_entry *e, void **dstptr,
|
||||
unsigned int *size,
|
||||
struct xt_table_info *newinfo, unsigned char *base)
|
||||
|
|
@ -1587,10 +1587,9 @@ compat_copy_entry_from_user(struct compat_ip6t_entry *e, void **dstptr,
|
|||
struct xt_entry_target *t;
|
||||
struct ip6t_entry *de;
|
||||
unsigned int origsize;
|
||||
int ret, h;
|
||||
int h;
|
||||
struct xt_entry_match *ematch;
|
||||
|
||||
ret = 0;
|
||||
origsize = *size;
|
||||
de = (struct ip6t_entry *)*dstptr;
|
||||
memcpy(de, e, sizeof(struct ip6t_entry));
|
||||
|
|
@ -1599,11 +1598,9 @@ compat_copy_entry_from_user(struct compat_ip6t_entry *e, void **dstptr,
|
|||
*dstptr += sizeof(struct ip6t_entry);
|
||||
*size += sizeof(struct ip6t_entry) - sizeof(struct compat_ip6t_entry);
|
||||
|
||||
xt_ematch_foreach(ematch, e) {
|
||||
ret = xt_compat_match_from_user(ematch, dstptr, size);
|
||||
if (ret != 0)
|
||||
return ret;
|
||||
}
|
||||
xt_ematch_foreach(ematch, e)
|
||||
xt_compat_match_from_user(ematch, dstptr, size);
|
||||
|
||||
de->target_offset = e->target_offset - (origsize - *size);
|
||||
t = compat_ip6t_get_target(e);
|
||||
xt_compat_target_from_user(t, dstptr, size);
|
||||
|
|
@ -1615,7 +1612,6 @@ compat_copy_entry_from_user(struct compat_ip6t_entry *e, void **dstptr,
|
|||
if ((unsigned char *)de - base < newinfo->underflow[h])
|
||||
newinfo->underflow[h] -= origsize - *size;
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int compat_check_entry(struct ip6t_entry *e, struct net *net,
|
||||
|
|
@ -1736,17 +1732,12 @@ translate_compat_table(struct net *net,
|
|||
}
|
||||
entry1 = newinfo->entries;
|
||||
pos = entry1;
|
||||
size = compatr->size;
|
||||
xt_entry_foreach(iter0, entry0, compatr->size) {
|
||||
ret = compat_copy_entry_from_user(iter0, &pos, &size,
|
||||
newinfo, entry1);
|
||||
if (ret != 0)
|
||||
break;
|
||||
}
|
||||
xt_entry_foreach(iter0, entry0, compatr->size)
|
||||
compat_copy_entry_from_user(iter0, &pos, &size,
|
||||
newinfo, entry1);
|
||||
|
||||
xt_compat_flush_offsets(AF_INET6);
|
||||
xt_compat_unlock(AF_INET6);
|
||||
if (ret)
|
||||
goto free_newinfo;
|
||||
|
||||
ret = -ELOOP;
|
||||
if (!mark_source_chains(newinfo, compatr->valid_hooks, entry1))
|
||||
|
|
|
|||
|
|
@ -525,8 +525,8 @@ int xt_compat_match_offset(const struct xt_match *match)
|
|||
}
|
||||
EXPORT_SYMBOL_GPL(xt_compat_match_offset);
|
||||
|
||||
int xt_compat_match_from_user(struct xt_entry_match *m, void **dstptr,
|
||||
unsigned int *size)
|
||||
void xt_compat_match_from_user(struct xt_entry_match *m, void **dstptr,
|
||||
unsigned int *size)
|
||||
{
|
||||
const struct xt_match *match = m->u.kernel.match;
|
||||
struct compat_xt_entry_match *cm = (struct compat_xt_entry_match *)m;
|
||||
|
|
@ -548,7 +548,6 @@ int xt_compat_match_from_user(struct xt_entry_match *m, void **dstptr,
|
|||
|
||||
*size += off;
|
||||
*dstptr += msize;
|
||||
return 0;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(xt_compat_match_from_user);
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue