Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-10-30 16:51:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

netfilter: Use correct return for seq_show functions

Browse Source 
Using seq_has_overflowed doesn't produce the right return value.
Either 0 or -1 is, but 0 is much more common and works well when
seq allocation retries.

I believe this doesn't matter as the initial allocation is always
sufficient, this is just a correctness patch.

Miscellanea:

o Don't use strlen, use *ptr to determine if a string
  should be emitted like all the other tests here
o Delete unnecessary return statements

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
This commit is contained in:
Joe Perches 2015-05-12 18:28:23 -07:00 committed by Pablo Neira Ayuso
parent 55917a21d0
commit 861fb1078f
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/netfilter/nfnetlink_queue_core.c
View File

@ -1257,7 +1257,7 @@ static int seq_show(struct seq_file *s, void *v)
inst->copy_mode, inst->copy_range,
inst->queue_dropped, inst->queue_user_dropped,
inst->id_sequence, 1);
return seq_has_overflowed(s);
return 0;
}
static const struct seq_operations nfqnl_seq_ops = {

18
net/netfilter/x_tables.c
View File

@ -947,11 +947,9 @@ static int xt_table_seq_show(struct seq_file *seq, void *v)
{
struct xt_table *table = list_entry(v, struct xt_table, list);
if (strlen(table->name)) {
if (*table->name)
seq_printf(seq, "%s\n", table->name);
return seq_has_overflowed(seq);
} else
return 0;
return 0;
}
static const struct seq_operations xt_table_seq_ops = {
@ -1087,10 +1085,8 @@ static int xt_match_seq_show(struct seq_file *seq, void *v)
if (trav->curr == trav->head)
return 0;
match = list_entry(trav->curr, struct xt_match, list);
if (*match->name == '\0')
return 0;
seq_printf(seq, "%s\n", match->name);
return seq_has_overflowed(seq);
if (*match->name)
seq_printf(seq, "%s\n", match->name);
}
return 0;
}
@ -1142,10 +1138,8 @@ static int xt_target_seq_show(struct seq_file *seq, void *v)
if (trav->curr == trav->head)
return 0;
target = list_entry(trav->curr, struct xt_target, list);
if (*target->name == '\0')
return 0;
seq_printf(seq, "%s\n", target->name);
return seq_has_overflowed(seq);
if (*target->name)
seq_printf(seq, "%s\n", target->name);
}
return 0;
}