| Message ID | 1374519718-8299-1-git-send-email-jerry.snitselaar@oracle.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On Mon, Jul 22, 2013 at 12:01:58PM -0700, Jerry Snitselaar wrote: > With the <= max condition in the for loop, it will be always go 1 > element further than needed. If the condition for the while loop is > never met, then max is MAX_STAT_DEPTH, and for loop will walk off the > end of nodesizes[]. > > Signed-off-by: Jerry Snitselaar <jerry.snitselaar@oracle.com> Acked-by: Hannes Frederic Sowa <hannes@stressinduktion.org> Thanks, Hannes -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Hannes Frederic Sowa <hannes@stressinduktion.org> Date: Wed, 24 Jul 2013 17:00:00 +0200 > On Mon, Jul 22, 2013 at 12:01:58PM -0700, Jerry Snitselaar wrote: >> With the <= max condition in the for loop, it will be always go 1 >> element further than needed. If the condition for the while loop is >> never met, then max is MAX_STAT_DEPTH, and for loop will walk off the >> end of nodesizes[]. >> >> Signed-off-by: Jerry Snitselaar <jerry.snitselaar@oracle.com> > > Acked-by: Hannes Frederic Sowa <hannes@stressinduktion.org> Applied, thanks. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c index 49616fe..108a1e9c 100644 --- a/net/ipv4/fib_trie.c +++ b/net/ipv4/fib_trie.c @@ -2133,7 +2133,7 @@ static void trie_show_stats(struct seq_file *seq, struct trie_stat *stat) max--; pointers = 0; - for (i = 1; i <= max; i++) + for (i = 1; i < max; i++) if (stat->nodesizes[i] != 0) { seq_printf(seq, " %u: %u", i, stat->nodesizes[i]); pointers += (1<<i) * stat->nodesizes[i];
With the <= max condition in the for loop, it will be always go 1 element further than needed. If the condition for the while loop is never met, then max is MAX_STAT_DEPTH, and for loop will walk off the end of nodesizes[]. Signed-off-by: Jerry Snitselaar <jerry.snitselaar@oracle.com> --- net/ipv4/fib_trie.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)