hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[NETFILTER]: ip_tables: reformat compat code 

The compat code has some very odd formating, clean it up before porting
it to ip6_tables.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Patrick McHardy 2007-12-17 21:46:15 -08:00 committed by David S. Miller
parent ac8e27fd89
commit 4b4782486d
1 changed files with 92 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
net/ipv4/netfilter/ip_tables.c
View File

@ -600,8 +600,8 @@ check_entry(struct ipt_entry *e, const char *name)
} }
static inline int check_match(struct ipt_entry_match *m, const char *name, static inline int check_match(struct ipt_entry_match *m, const char *name,
const struct ipt_ip *ip, unsigned int hookmask, const struct ipt_ip *ip,
unsigned int *i) unsigned int hookmask, unsigned int *i)
{ {
struct xt_match *match; struct xt_match *match;
int ret; int ret;
@ -663,8 +663,8 @@ static inline int check_target(struct ipt_entry *e, const char *name)
name, e->comefrom, e->ip.proto, name, e->comefrom, e->ip.proto,
e->ip.invflags & IPT_INV_PROTO); e->ip.invflags & IPT_INV_PROTO);
if (!ret && t->u.kernel.target->checkentry if (!ret && t->u.kernel.target->checkentry
&& !t->u.kernel.target->checkentry(name, e, target, && !t->u.kernel.target->checkentry(name, e, target, t->data,
t->data, e->comefrom)) { e->comefrom)) {
duprintf("ip_tables: check failed for `%s'.\n", duprintf("ip_tables: check failed for `%s'.\n",
t->u.kernel.target->name); t->u.kernel.target->name);
ret = -EINVAL; ret = -EINVAL;
@ -1020,7 +1020,7 @@ struct compat_delta {
short delta; short delta;
}; };
static struct compat_delta *compat_offsets = NULL; static struct compat_delta *compat_offsets;
static int compat_add_offset(unsigned int offset, short delta) static int compat_add_offset(unsigned int offset, short delta)
{ {
@ -1109,11 +1109,11 @@ static int compat_calc_entry(struct ipt_entry *e,
return ret; return ret;
for (i = 0; i < NF_INET_NUMHOOKS; i++) { for (i = 0; i < NF_INET_NUMHOOKS; i++) {
if (info->hook_entry[i] && (e < (struct ipt_entry *) if (info->hook_entry[i] &&
(base + info->hook_entry[i]))) (e < (struct ipt_entry *)(base + info->hook_entry[i])))
newinfo->hook_entry[i] -= off; newinfo->hook_entry[i] -= off;
if (info->underflow[i] && (e < (struct ipt_entry *) if (info->underflow[i] &&
(base + info->underflow[i]))) (e < (struct ipt_entry *)(base + info->underflow[i])))
newinfo->underflow[i] -= off; newinfo->underflow[i] -= off;
} }
return 0; return 0;
@ -1132,7 +1132,8 @@ static int compat_table_info(const struct xt_table_info *info,
newinfo->initial_entries = 0; newinfo->initial_entries = 0;
loc_cpu_entry = info->entries[raw_smp_processor_id()]; loc_cpu_entry = info->entries[raw_smp_processor_id()];
return IPT_ENTRY_ITERATE(loc_cpu_entry, info->size, return IPT_ENTRY_ITERATE(loc_cpu_entry, info->size,
compat_calc_entry, info, loc_cpu_entry, newinfo); compat_calc_entry, info, loc_cpu_entry,
newinfo);
} }
#endif #endif
@ -1289,7 +1290,8 @@ __do_replace(const char *name, unsigned int valid_hooks,
get_counters(oldinfo, counters); get_counters(oldinfo, counters);
/* Decrease module usage counts and free resource */ /* Decrease module usage counts and free resource */
loc_cpu_old_entry = oldinfo->entries[raw_smp_processor_id()]; loc_cpu_old_entry = oldinfo->entries[raw_smp_processor_id()];
IPT_ENTRY_ITERATE(loc_cpu_old_entry, oldinfo->size, cleanup_entry,NULL); IPT_ENTRY_ITERATE(loc_cpu_old_entry, oldinfo->size, cleanup_entry,
NULL);
xt_free_table_info(oldinfo); xt_free_table_info(oldinfo);
if (copy_to_user(counters_ptr, counters, if (copy_to_user(counters_ptr, counters,
sizeof(struct xt_counters) * num_counters) != 0) sizeof(struct xt_counters) * num_counters) != 0)
@ -1346,9 +1348,8 @@ do_replace(void __user *user, unsigned int len)
duprintf("ip_tables: Translated table\n"); duprintf("ip_tables: Translated table\n");
ret = __do_replace(tmp.name, tmp.valid_hooks, ret = __do_replace(tmp.name, tmp.valid_hooks, newinfo,
newinfo, tmp.num_counters, tmp.num_counters, tmp.counters);
tmp.counters);
if (ret) if (ret)
goto free_newinfo_untrans; goto free_newinfo_untrans;
return 0; return 0;
@ -1653,15 +1654,18 @@ release_matches:
return ret; return ret;
} }
static inline int compat_copy_match_from_user(struct ipt_entry_match *m, static inline int
void **dstptr, compat_uint_t *size, const char *name, compat_copy_match_from_user(struct ipt_entry_match *m,
const struct ipt_ip *ip, unsigned int hookmask) void **dstptr, compat_uint_t *size,
const char *name, const struct ipt_ip *ip,
unsigned int hookmask)
{ {
xt_compat_match_from_user(m, dstptr, size); xt_compat_match_from_user(m, dstptr, size);
return 0; return 0;
} }
static int compat_copy_entry_from_user(struct ipt_entry *e, void **dstptr, static int
compat_copy_entry_from_user(struct ipt_entry *e, void **dstptr,
unsigned int *size, const char *name, unsigned int *size, const char *name,
struct xt_table_info *newinfo, unsigned char *base) struct xt_table_info *newinfo, unsigned char *base)
{ {
@ -1874,15 +1878,15 @@ compat_do_replace(void __user *user, unsigned int len)
ret = translate_compat_table(tmp.name, tmp.valid_hooks, ret = translate_compat_table(tmp.name, tmp.valid_hooks,
&newinfo, &loc_cpu_entry, tmp.size, &newinfo, &loc_cpu_entry, tmp.size,
tmp.num_entries, tmp.hook_entry, tmp.underflow); tmp.num_entries, tmp.hook_entry,
tmp.underflow);
if (ret != 0) if (ret != 0)
goto free_newinfo; goto free_newinfo;
duprintf("compat_do_replace: Translated table\n"); duprintf("compat_do_replace: Translated table\n");
ret = __do_replace(tmp.name, tmp.valid_hooks, ret = __do_replace(tmp.name, tmp.valid_hooks, newinfo,
newinfo, tmp.num_counters, tmp.num_counters, compat_ptr(tmp.counters));
compat_ptr(tmp.counters));
if (ret) if (ret)
goto free_newinfo_untrans; goto free_newinfo_untrans;
return 0; return 0;
@ -1920,15 +1924,15 @@ compat_do_ipt_set_ctl(struct sock *sk, int cmd, void __user *user,
return ret; return ret;
} }
struct compat_ipt_get_entries struct compat_ipt_get_entries {
{
char name[IPT_TABLE_MAXNAMELEN]; char name[IPT_TABLE_MAXNAMELEN];
compat_uint_t size; compat_uint_t size;
struct compat_ipt_entry entrytable[0]; struct compat_ipt_entry entrytable[0];
}; };
static int compat_copy_entries_to_user(unsigned int total_size, static int
struct xt_table *table, void __user *userptr) compat_copy_entries_to_user(unsigned int total_size, struct xt_table *table,
void __user *userptr)
{ {
struct xt_counters *counters; struct xt_counters *counters;
struct xt_table_info *private = table->private; struct xt_table_info *private = table->private;
@ -1964,7 +1968,6 @@ compat_get_entries(struct compat_ipt_get_entries __user *uptr, int *len)
struct compat_ipt_get_entries get; struct compat_ipt_get_entries get;
struct xt_table *t; struct xt_table *t;
if (*len < sizeof(get)) { if (*len < sizeof(get)) {
duprintf("compat_get_entries: %u < %u\n", duprintf("compat_get_entries: %u < %u\n",
*len, (unsigned int)sizeof(get)); *len, (unsigned int)sizeof(get));