lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

netfilter: xtables: restore indentation

Browse Source 
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
Signed-off-by: Patrick McHardy <kaber@trash.net>
This commit is contained in:
Jan Engelhardt
2010-02-26 17:53:31 +01:00
committed by Patrick McHardy
parent a49c650371
commit 6b4ff2d767
3 changed files with 44 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
net/ipv4/netfilter/arp_tables.c
View File

@@ -644,8 +644,10 @@ static int translate_table(struct xt_table_info *newinfo, void *entry0,
/* Walk through entries, checking offsets. */ /* Walk through entries, checking offsets. */
xt_entry_foreach(iter, entry0, newinfo->size) { xt_entry_foreach(iter, entry0, newinfo->size) {
ret = check_entry_size_and_hooks(iter, newinfo, entry0, ret = check_entry_size_and_hooks(iter, newinfo, entry0,
entry0 + repl->size, repl->hook_entry, repl->underflow, entry0 + repl->size,
repl->valid_hooks); repl->hook_entry,
repl->underflow,
repl->valid_hooks);
if (ret != 0) if (ret != 0)
break; break;
++i; ++i;
@@ -730,7 +732,7 @@ static void get_counters(const struct xt_table_info *t,
i = 0; i = 0;
xt_entry_foreach(iter, t->entries[curcpu], t->size) { xt_entry_foreach(iter, t->entries[curcpu], t->size) {
SET_COUNTER(counters[i], iter->counters.bcnt, SET_COUNTER(counters[i], iter->counters.bcnt,
iter->counters.pcnt); iter->counters.pcnt);
++i; ++i;
} }
@@ -741,7 +743,7 @@ static void get_counters(const struct xt_table_info *t,
xt_info_wrlock(cpu); xt_info_wrlock(cpu);
xt_entry_foreach(iter, t->entries[cpu], t->size) { xt_entry_foreach(iter, t->entries[cpu], t->size) {
ADD_COUNTER(counters[i], iter->counters.bcnt, ADD_COUNTER(counters[i], iter->counters.bcnt,
iter->counters.pcnt); iter->counters.pcnt);
++i; ++i;
} }
xt_info_wrunlock(cpu); xt_info_wrunlock(cpu);
@@ -1356,8 +1358,11 @@ static int translate_compat_table(const char *name,
/* Walk through entries, checking offsets. */ /* Walk through entries, checking offsets. */
xt_entry_foreach(iter0, entry0, total_size) { xt_entry_foreach(iter0, entry0, total_size) {
ret = check_compat_entry_size_and_hooks(iter0, info, &size, ret = check_compat_entry_size_and_hooks(iter0, info, &size,
entry0, entry0 + total_size, hook_entries, underflows, entry0,
name); entry0 + total_size,
hook_entries,
underflows,
name);
if (ret != 0) if (ret != 0)
goto out_unlock; goto out_unlock;
++j; ++j;
@@ -1401,8 +1406,8 @@ static int translate_compat_table(const char *name,
pos = entry1; pos = entry1;
size = total_size; size = total_size;
xt_entry_foreach(iter0, entry0, total_size) { xt_entry_foreach(iter0, entry0, total_size) {
ret = compat_copy_entry_from_user(iter0, &pos, ret = compat_copy_entry_from_user(iter0, &pos, &size,
&size, name, newinfo, entry1); name, newinfo, entry1);
if (ret != 0) if (ret != 0)
break; break;
} }
@@ -1617,7 +1622,7 @@ static int compat_copy_entries_to_user(unsigned int total_size,
size = total_size; size = total_size;
xt_entry_foreach(iter, loc_cpu_entry, total_size) { xt_entry_foreach(iter, loc_cpu_entry, total_size) {
ret = compat_copy_entry_to_user(iter, &pos, ret = compat_copy_entry_to_user(iter, &pos,
&size, counters, i++); &size, counters, i++);
if (ret != 0) if (ret != 0)
break; break;
} }

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

@@ -836,8 +836,10 @@ translate_table(struct net *net, struct xt_table_info *newinfo, void *entry0,
/* Walk through entries, checking offsets. */ /* Walk through entries, checking offsets. */
xt_entry_foreach(iter, entry0, newinfo->size) { xt_entry_foreach(iter, entry0, newinfo->size) {
ret = check_entry_size_and_hooks(iter, newinfo, entry0, ret = check_entry_size_and_hooks(iter, newinfo, entry0,
entry0 + repl->size, repl->hook_entry, repl->underflow, entry0 + repl->size,
repl->valid_hooks); repl->hook_entry,
repl->underflow,
repl->valid_hooks);
if (ret != 0) if (ret != 0)
return ret; return ret;
++i; ++i;
@@ -918,7 +920,7 @@ get_counters(const struct xt_table_info *t,
i = 0; i = 0;
xt_entry_foreach(iter, t->entries[curcpu], t->size) { xt_entry_foreach(iter, t->entries[curcpu], t->size) {
SET_COUNTER(counters[i], iter->counters.bcnt, SET_COUNTER(counters[i], iter->counters.bcnt,
iter->counters.pcnt); iter->counters.pcnt);
++i; ++i;
} }
@@ -929,7 +931,7 @@ get_counters(const struct xt_table_info *t,
xt_info_wrlock(cpu); xt_info_wrlock(cpu);
xt_entry_foreach(iter, t->entries[cpu], t->size) { xt_entry_foreach(iter, t->entries[cpu], t->size) {
ADD_COUNTER(counters[i], iter->counters.bcnt, ADD_COUNTER(counters[i], iter->counters.bcnt,
iter->counters.pcnt); iter->counters.pcnt);
++i; /* macro does multi eval of i */ ++i; /* macro does multi eval of i */
} }
xt_info_wrunlock(cpu); xt_info_wrunlock(cpu);
@@ -1540,7 +1542,7 @@ check_compat_entry_size_and_hooks(struct compat_ipt_entry *e,
j = 0; j = 0;
xt_ematch_foreach(ematch, e) { xt_ematch_foreach(ematch, e) {
ret = compat_find_calc_match(ematch, name, ret = compat_find_calc_match(ematch, name,
&e->ip, e->comefrom, &off); &e->ip, e->comefrom, &off);
if (ret != 0) if (ret != 0)
goto release_matches; goto release_matches;
++j; ++j;
@@ -1701,8 +1703,11 @@ translate_compat_table(struct net *net,
/* Walk through entries, checking offsets. */ /* Walk through entries, checking offsets. */
xt_entry_foreach(iter0, entry0, total_size) { xt_entry_foreach(iter0, entry0, total_size) {
ret = check_compat_entry_size_and_hooks(iter0, info, &size, ret = check_compat_entry_size_and_hooks(iter0, info, &size,
entry0, entry0 + total_size, hook_entries, underflows, entry0,
name); entry0 + total_size,
hook_entries,
underflows,
name);
if (ret != 0) if (ret != 0)
goto out_unlock; goto out_unlock;
++j; ++j;
@@ -1746,8 +1751,8 @@ translate_compat_table(struct net *net,
pos = entry1; pos = entry1;
size = total_size; size = total_size;
xt_entry_foreach(iter0, entry0, total_size) { xt_entry_foreach(iter0, entry0, total_size) {
ret = compat_copy_entry_from_user(iter0, &pos, ret = compat_copy_entry_from_user(iter0, &pos, &size,
&size, name, newinfo, entry1); name, newinfo, entry1);
if (ret != 0) if (ret != 0)
break; break;
} }
@@ -1927,7 +1932,7 @@ compat_copy_entries_to_user(unsigned int total_size, struct xt_table *table,
size = total_size; size = total_size;
xt_entry_foreach(iter, loc_cpu_entry, total_size) { xt_entry_foreach(iter, loc_cpu_entry, total_size) {
ret = compat_copy_entry_to_user(iter, &pos, ret = compat_copy_entry_to_user(iter, &pos,
&size, counters, i++); &size, counters, i++);
if (ret != 0) if (ret != 0)
break; break;
} }

25
net/ipv6/netfilter/ip6_tables.c
View File

@@ -866,8 +866,10 @@ translate_table(struct net *net, struct xt_table_info *newinfo, void *entry0,
/* Walk through entries, checking offsets. */ /* Walk through entries, checking offsets. */
xt_entry_foreach(iter, entry0, newinfo->size) { xt_entry_foreach(iter, entry0, newinfo->size) {
ret = check_entry_size_and_hooks(iter, newinfo, entry0, ret = check_entry_size_and_hooks(iter, newinfo, entry0,
entry0 + repl->size, repl->hook_entry, repl->underflow, entry0 + repl->size,
repl->valid_hooks); repl->hook_entry,
repl->underflow,
repl->valid_hooks);
if (ret != 0) if (ret != 0)
return ret; return ret;
++i; ++i;
@@ -948,7 +950,7 @@ get_counters(const struct xt_table_info *t,
i = 0; i = 0;
xt_entry_foreach(iter, t->entries[curcpu], t->size) { xt_entry_foreach(iter, t->entries[curcpu], t->size) {
SET_COUNTER(counters[i], iter->counters.bcnt, SET_COUNTER(counters[i], iter->counters.bcnt,
iter->counters.pcnt); iter->counters.pcnt);
++i; ++i;
} }
@@ -959,7 +961,7 @@ get_counters(const struct xt_table_info *t,
xt_info_wrlock(cpu); xt_info_wrlock(cpu);
xt_entry_foreach(iter, t->entries[cpu], t->size) { xt_entry_foreach(iter, t->entries[cpu], t->size) {
ADD_COUNTER(counters[i], iter->counters.bcnt, ADD_COUNTER(counters[i], iter->counters.bcnt,
iter->counters.pcnt); iter->counters.pcnt);
++i; ++i;
} }
xt_info_wrunlock(cpu); xt_info_wrunlock(cpu);
@@ -1573,7 +1575,7 @@ check_compat_entry_size_and_hooks(struct compat_ip6t_entry *e,
j = 0; j = 0;
xt_ematch_foreach(ematch, e) { xt_ematch_foreach(ematch, e) {
ret = compat_find_calc_match(ematch, name, ret = compat_find_calc_match(ematch, name,
&e->ipv6, e->comefrom, &off); &e->ipv6, e->comefrom, &off);
if (ret != 0) if (ret != 0)
goto release_matches; goto release_matches;
++j; ++j;
@@ -1734,8 +1736,11 @@ translate_compat_table(struct net *net,
/* Walk through entries, checking offsets. */ /* Walk through entries, checking offsets. */
xt_entry_foreach(iter0, entry0, total_size) { xt_entry_foreach(iter0, entry0, total_size) {
ret = check_compat_entry_size_and_hooks(iter0, info, &size, ret = check_compat_entry_size_and_hooks(iter0, info, &size,
entry0, entry0 + total_size, hook_entries, underflows, entry0,
name); entry0 + total_size,
hook_entries,
underflows,
name);
if (ret != 0) if (ret != 0)
goto out_unlock; goto out_unlock;
++j; ++j;
@@ -1779,8 +1784,8 @@ translate_compat_table(struct net *net,
pos = entry1; pos = entry1;
size = total_size; size = total_size;
xt_entry_foreach(iter0, entry0, total_size) { xt_entry_foreach(iter0, entry0, total_size) {
ret = compat_copy_entry_from_user(iter0, &pos, ret = compat_copy_entry_from_user(iter0, &pos, &size,
&size, name, newinfo, entry1); name, newinfo, entry1);
if (ret != 0) if (ret != 0)
break; break;
} }
@@ -1960,7 +1965,7 @@ compat_copy_entries_to_user(unsigned int total_size, struct xt_table *table,
size = total_size; size = total_size;
xt_entry_foreach(iter, loc_cpu_entry, total_size) { xt_entry_foreach(iter, loc_cpu_entry, total_size) {
ret = compat_copy_entry_to_user(iter, &pos, ret = compat_copy_entry_to_user(iter, &pos,
&size, counters, i++); &size, counters, i++);
if (ret != 0) if (ret != 0)
break; break;
} }