From 9782d8fa2f26ca25e083419cdc6d25635460d743 Mon Sep 17 00:00:00 2001 From: Chase Douglas Date: Tue, 15 Jun 2010 12:29:15 -0400 Subject: [PATCH] --- yaml --- r: 205293 b: refs/heads/master c: d62f85d1e22e537192ce494c89540e1ac0d8bfc7 h: refs/heads/master i: 205291: da4373afbf7d381d7cf0e31ce3a36556c5c0d478 v: v3 --- [refs] | 2 +- trunk/kernel/trace/trace_functions_graph.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index b81b2a8479e6..a8b418abaa57 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 67ead0a6ceb001b4cb891d782e440f0e79493ba2 +refs/heads/master: d62f85d1e22e537192ce494c89540e1ac0d8bfc7 diff --git a/trunk/kernel/trace/trace_functions_graph.c b/trunk/kernel/trace/trace_functions_graph.c index 79f4bac99a94..6bff23625781 100644 --- a/trunk/kernel/trace/trace_functions_graph.c +++ b/trunk/kernel/trace/trace_functions_graph.c @@ -641,7 +641,8 @@ trace_print_graph_duration(unsigned long long duration, struct trace_seq *s) /* Print nsecs (we don't want to exceed 7 numbers) */ if (len < 7) { - snprintf(nsecs_str, 8 - len, "%03lu", nsecs_rem); + snprintf(nsecs_str, min(sizeof(nsecs_str), 8UL - len), "%03lu", + nsecs_rem); ret = trace_seq_printf(s, ".%s", nsecs_str); if (!ret) return TRACE_TYPE_PARTIAL_LINE;