netfilter: x_tables: xt_compat_match_from_user doesn't need a retval
[ Upstream commit 0188346f21
]
Always returned 0.
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
wifi-calibration
parent
05e089b3a2
commit
2756b2a324
|
@ -425,7 +425,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_calc_jump(u_int8_t af, unsigned int offset);
|
||||||
|
|
||||||
int xt_compat_match_offset(const struct xt_match *match);
|
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);
|
unsigned int *size);
|
||||||
int xt_compat_match_to_user(const struct xt_entry_match *m,
|
int xt_compat_match_to_user(const struct xt_entry_match *m,
|
||||||
void __user **dstptr, unsigned int *size);
|
void __user **dstptr, unsigned int *size);
|
||||||
|
|
|
@ -1302,7 +1302,7 @@ out:
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static void
|
||||||
compat_copy_entry_from_user(struct compat_arpt_entry *e, void **dstptr,
|
compat_copy_entry_from_user(struct compat_arpt_entry *e, void **dstptr,
|
||||||
unsigned int *size,
|
unsigned int *size,
|
||||||
struct xt_table_info *newinfo, unsigned char *base)
|
struct xt_table_info *newinfo, unsigned char *base)
|
||||||
|
@ -1311,9 +1311,8 @@ compat_copy_entry_from_user(struct compat_arpt_entry *e, void **dstptr,
|
||||||
struct xt_target *target;
|
struct xt_target *target;
|
||||||
struct arpt_entry *de;
|
struct arpt_entry *de;
|
||||||
unsigned int origsize;
|
unsigned int origsize;
|
||||||
int ret, h;
|
int h;
|
||||||
|
|
||||||
ret = 0;
|
|
||||||
origsize = *size;
|
origsize = *size;
|
||||||
de = (struct arpt_entry *)*dstptr;
|
de = (struct arpt_entry *)*dstptr;
|
||||||
memcpy(de, e, sizeof(struct arpt_entry));
|
memcpy(de, e, sizeof(struct arpt_entry));
|
||||||
|
@ -1334,7 +1333,6 @@ compat_copy_entry_from_user(struct compat_arpt_entry *e, void **dstptr,
|
||||||
if ((unsigned char *)de - base < newinfo->underflow[h])
|
if ((unsigned char *)de - base < newinfo->underflow[h])
|
||||||
newinfo->underflow[h] -= origsize - *size;
|
newinfo->underflow[h] -= origsize - *size;
|
||||||
}
|
}
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static int translate_compat_table(struct xt_table_info **pinfo,
|
static int translate_compat_table(struct xt_table_info **pinfo,
|
||||||
|
@ -1413,16 +1411,11 @@ static int translate_compat_table(struct xt_table_info **pinfo,
|
||||||
entry1 = newinfo->entries[raw_smp_processor_id()];
|
entry1 = newinfo->entries[raw_smp_processor_id()];
|
||||||
pos = entry1;
|
pos = entry1;
|
||||||
size = compatr->size;
|
size = compatr->size;
|
||||||
xt_entry_foreach(iter0, entry0, compatr->size) {
|
xt_entry_foreach(iter0, entry0, compatr->size)
|
||||||
ret = compat_copy_entry_from_user(iter0, &pos, &size,
|
compat_copy_entry_from_user(iter0, &pos, &size,
|
||||||
newinfo, entry1);
|
newinfo, entry1);
|
||||||
if (ret != 0)
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
xt_compat_flush_offsets(NFPROTO_ARP);
|
xt_compat_flush_offsets(NFPROTO_ARP);
|
||||||
xt_compat_unlock(NFPROTO_ARP);
|
xt_compat_unlock(NFPROTO_ARP);
|
||||||
if (ret)
|
|
||||||
goto free_newinfo;
|
|
||||||
|
|
||||||
ret = -ELOOP;
|
ret = -ELOOP;
|
||||||
if (!mark_source_chains(newinfo, compatr->valid_hooks, entry1))
|
if (!mark_source_chains(newinfo, compatr->valid_hooks, entry1))
|
||||||
|
|
|
@ -1567,7 +1567,7 @@ release_matches:
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static void
|
||||||
compat_copy_entry_from_user(struct compat_ipt_entry *e, void **dstptr,
|
compat_copy_entry_from_user(struct compat_ipt_entry *e, void **dstptr,
|
||||||
unsigned int *size,
|
unsigned int *size,
|
||||||
struct xt_table_info *newinfo, unsigned char *base)
|
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 xt_target *target;
|
||||||
struct ipt_entry *de;
|
struct ipt_entry *de;
|
||||||
unsigned int origsize;
|
unsigned int origsize;
|
||||||
int ret, h;
|
int h;
|
||||||
struct xt_entry_match *ematch;
|
struct xt_entry_match *ematch;
|
||||||
|
|
||||||
ret = 0;
|
|
||||||
origsize = *size;
|
origsize = *size;
|
||||||
de = (struct ipt_entry *)*dstptr;
|
de = (struct ipt_entry *)*dstptr;
|
||||||
memcpy(de, e, sizeof(struct ipt_entry));
|
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);
|
*dstptr += sizeof(struct ipt_entry);
|
||||||
*size += sizeof(struct ipt_entry) - sizeof(struct compat_ipt_entry);
|
*size += sizeof(struct ipt_entry) - sizeof(struct compat_ipt_entry);
|
||||||
|
|
||||||
xt_ematch_foreach(ematch, e) {
|
xt_ematch_foreach(ematch, e)
|
||||||
ret = xt_compat_match_from_user(ematch, dstptr, size);
|
xt_compat_match_from_user(ematch, dstptr, size);
|
||||||
if (ret != 0)
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
de->target_offset = e->target_offset - (origsize - *size);
|
de->target_offset = e->target_offset - (origsize - *size);
|
||||||
t = compat_ipt_get_target(e);
|
t = compat_ipt_get_target(e);
|
||||||
target = t->u.kernel.target;
|
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])
|
if ((unsigned char *)de - base < newinfo->underflow[h])
|
||||||
newinfo->underflow[h] -= origsize - *size;
|
newinfo->underflow[h] -= origsize - *size;
|
||||||
}
|
}
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
|
@ -1721,16 +1717,12 @@ translate_compat_table(struct net *net,
|
||||||
entry1 = newinfo->entries[raw_smp_processor_id()];
|
entry1 = newinfo->entries[raw_smp_processor_id()];
|
||||||
pos = entry1;
|
pos = entry1;
|
||||||
size = compatr->size;
|
size = compatr->size;
|
||||||
xt_entry_foreach(iter0, entry0, compatr->size) {
|
xt_entry_foreach(iter0, entry0, compatr->size)
|
||||||
ret = compat_copy_entry_from_user(iter0, &pos, &size,
|
compat_copy_entry_from_user(iter0, &pos, &size,
|
||||||
newinfo, entry1);
|
newinfo, entry1);
|
||||||
if (ret != 0)
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
xt_compat_flush_offsets(AF_INET);
|
xt_compat_flush_offsets(AF_INET);
|
||||||
xt_compat_unlock(AF_INET);
|
xt_compat_unlock(AF_INET);
|
||||||
if (ret)
|
|
||||||
goto free_newinfo;
|
|
||||||
|
|
||||||
ret = -ELOOP;
|
ret = -ELOOP;
|
||||||
if (!mark_source_chains(newinfo, compatr->valid_hooks, entry1))
|
if (!mark_source_chains(newinfo, compatr->valid_hooks, entry1))
|
||||||
|
|
|
@ -1582,7 +1582,7 @@ release_matches:
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static void
|
||||||
compat_copy_entry_from_user(struct compat_ip6t_entry *e, void **dstptr,
|
compat_copy_entry_from_user(struct compat_ip6t_entry *e, void **dstptr,
|
||||||
unsigned int *size,
|
unsigned int *size,
|
||||||
struct xt_table_info *newinfo, unsigned char *base)
|
struct xt_table_info *newinfo, unsigned char *base)
|
||||||
|
@ -1590,10 +1590,9 @@ compat_copy_entry_from_user(struct compat_ip6t_entry *e, void **dstptr,
|
||||||
struct xt_entry_target *t;
|
struct xt_entry_target *t;
|
||||||
struct ip6t_entry *de;
|
struct ip6t_entry *de;
|
||||||
unsigned int origsize;
|
unsigned int origsize;
|
||||||
int ret, h;
|
int h;
|
||||||
struct xt_entry_match *ematch;
|
struct xt_entry_match *ematch;
|
||||||
|
|
||||||
ret = 0;
|
|
||||||
origsize = *size;
|
origsize = *size;
|
||||||
de = (struct ip6t_entry *)*dstptr;
|
de = (struct ip6t_entry *)*dstptr;
|
||||||
memcpy(de, e, sizeof(struct ip6t_entry));
|
memcpy(de, e, sizeof(struct ip6t_entry));
|
||||||
|
@ -1602,11 +1601,9 @@ compat_copy_entry_from_user(struct compat_ip6t_entry *e, void **dstptr,
|
||||||
*dstptr += sizeof(struct ip6t_entry);
|
*dstptr += sizeof(struct ip6t_entry);
|
||||||
*size += sizeof(struct ip6t_entry) - sizeof(struct compat_ip6t_entry);
|
*size += sizeof(struct ip6t_entry) - sizeof(struct compat_ip6t_entry);
|
||||||
|
|
||||||
xt_ematch_foreach(ematch, e) {
|
xt_ematch_foreach(ematch, e)
|
||||||
ret = xt_compat_match_from_user(ematch, dstptr, size);
|
xt_compat_match_from_user(ematch, dstptr, size);
|
||||||
if (ret != 0)
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
de->target_offset = e->target_offset - (origsize - *size);
|
de->target_offset = e->target_offset - (origsize - *size);
|
||||||
t = compat_ip6t_get_target(e);
|
t = compat_ip6t_get_target(e);
|
||||||
xt_compat_target_from_user(t, dstptr, size);
|
xt_compat_target_from_user(t, dstptr, size);
|
||||||
|
@ -1618,7 +1615,6 @@ compat_copy_entry_from_user(struct compat_ip6t_entry *e, void **dstptr,
|
||||||
if ((unsigned char *)de - base < newinfo->underflow[h])
|
if ((unsigned char *)de - base < newinfo->underflow[h])
|
||||||
newinfo->underflow[h] -= origsize - *size;
|
newinfo->underflow[h] -= origsize - *size;
|
||||||
}
|
}
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static int compat_check_entry(struct ip6t_entry *e, struct net *net,
|
static int compat_check_entry(struct ip6t_entry *e, struct net *net,
|
||||||
|
@ -1733,17 +1729,12 @@ translate_compat_table(struct net *net,
|
||||||
}
|
}
|
||||||
entry1 = newinfo->entries[raw_smp_processor_id()];
|
entry1 = newinfo->entries[raw_smp_processor_id()];
|
||||||
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,
|
||||||
ret = compat_copy_entry_from_user(iter0, &pos, &size,
|
newinfo, entry1);
|
||||||
newinfo, entry1);
|
|
||||||
if (ret != 0)
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
xt_compat_flush_offsets(AF_INET6);
|
xt_compat_flush_offsets(AF_INET6);
|
||||||
xt_compat_unlock(AF_INET6);
|
xt_compat_unlock(AF_INET6);
|
||||||
if (ret)
|
|
||||||
goto free_newinfo;
|
|
||||||
|
|
||||||
ret = -ELOOP;
|
ret = -ELOOP;
|
||||||
if (!mark_source_chains(newinfo, compatr->valid_hooks, entry1))
|
if (!mark_source_chains(newinfo, compatr->valid_hooks, entry1))
|
||||||
|
|
|
@ -528,8 +528,8 @@ int xt_compat_match_offset(const struct xt_match *match)
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL_GPL(xt_compat_match_offset);
|
EXPORT_SYMBOL_GPL(xt_compat_match_offset);
|
||||||
|
|
||||||
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)
|
unsigned int *size)
|
||||||
{
|
{
|
||||||
const struct xt_match *match = m->u.kernel.match;
|
const struct xt_match *match = m->u.kernel.match;
|
||||||
struct compat_xt_entry_match *cm = (struct compat_xt_entry_match *)m;
|
struct compat_xt_entry_match *cm = (struct compat_xt_entry_match *)m;
|
||||||
|
@ -551,7 +551,6 @@ int xt_compat_match_from_user(struct xt_entry_match *m, void **dstptr,
|
||||||
|
|
||||||
*size += off;
|
*size += off;
|
||||||
*dstptr += msize;
|
*dstptr += msize;
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL_GPL(xt_compat_match_from_user);
|
EXPORT_SYMBOL_GPL(xt_compat_match_from_user);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue