From: Eric Dumazet Date: Thu, 29 Nov 2007 12:07:57 +0000 (+1100) Subject: NET: Corrects a bug in ip_rt_acct_read() X-Git-Tag: v2.6.22.15~17 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e8597d874b0141dbfd9aeea4dd84c5a8a614c322;p=karo-tx-linux.git NET: Corrects a bug in ip_rt_acct_read() [NET]: Corrects a bug in ip_rt_acct_read() [ Upstream commit: 483b23ffa3a5f44767038b0a676d757e0668437e ] It seems that stats of cpu 0 are counted twice, since for_each_possible_cpu() is looping on all possible cpus, including 0 Before percpu conversion of ip_rt_acct, we should also remove the assumption that CPU 0 is online (or even possible) Signed-off-by: Eric Dumazet Cc: Herbert Xu Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- diff --git a/net/ipv4/route.c b/net/ipv4/route.c index 29ca63e81ced..4aa25518b60f 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c @@ -3150,18 +3150,14 @@ static int ip_rt_acct_read(char *buffer, char **start, off_t offset, offset /= sizeof(u32); if (length > 0) { - u32 *src = ((u32 *) IP_RT_ACCT_CPU(0)) + offset; u32 *dst = (u32 *) buffer; - /* Copy first cpu. */ *start = buffer; - memcpy(dst, src, length); + memset(dst, 0, length); - /* Add the other cpus in, one int at a time */ for_each_possible_cpu(i) { unsigned int j; - - src = ((u32 *) IP_RT_ACCT_CPU(i)) + offset; + u32 *src = ((u32 *) IP_RT_ACCT_CPU(i)) + offset; for (j = 0; j < length/4; j++) dst[j] += src[j];