Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-06 05:06:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

net: fix tiny output corruption of /proc/net/snmp6

Browse Source 
Because "name" is static, it can be occasionally be filled with
somewhat garbage if two processes read /proc/net/snmp6.

Also, remove useless casts and "-1" -- snprintf() correctly terminates it's
output.

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Alexey Dobriyan 2008-11-20 04:20:10 -08:00 committed by David S. Miller
parent a849854fc7
commit 5ece6c2ddd
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
net/ipv6/proc.c
View File

@ -132,7 +132,7 @@ static struct snmp_mib snmp6_udplite6_list[] = {
static void snmp6_seq_show_icmpv6msg(struct seq_file *seq, void **mib) static void snmp6_seq_show_icmpv6msg(struct seq_file *seq, void **mib)
{ {
static char name[32]; char name[32];
int i; int i;
/* print by name -- deprecated items */ /* print by name -- deprecated items */
@ -144,7 +144,7 @@ static void snmp6_seq_show_icmpv6msg(struct seq_file *seq, void **mib)
p = icmp6type2name[icmptype]; p = icmp6type2name[icmptype];
if (!p) /* don't print un-named types here */ if (!p) /* don't print un-named types here */
continue; continue;
(void) snprintf(name, sizeof(name)-1, "Icmp6%s%s", snprintf(name, sizeof(name), "Icmp6%s%s",
i & 0x100 ? "Out" : "In", p); i & 0x100 ? "Out" : "In", p);
seq_printf(seq, "%-32s\t%lu\n", name, seq_printf(seq, "%-32s\t%lu\n", name,
snmp_fold_field(mib, i)); snmp_fold_field(mib, i));
@ -157,7 +157,7 @@ static void snmp6_seq_show_icmpv6msg(struct seq_file *seq, void **mib)
val = snmp_fold_field(mib, i); val = snmp_fold_field(mib, i);
if (!val) if (!val)
continue; continue;
(void) snprintf(name, sizeof(name)-1, "Icmp6%sType%u", snprintf(name, sizeof(name), "Icmp6%sType%u",
i & 0x100 ? "Out" : "In", i & 0xff); i & 0x100 ? "Out" : "In", i & 0xff);
seq_printf(seq, "%-32s\t%lu\n", name, val); seq_printf(seq, "%-32s\t%lu\n", name, val);
} }