kernel/trace/trace_functions_graph.c: fix nsecs_str buffer size
PATCH 1/1 kernel/trace/trace_functions_graph.c: fix nsecs_str buffer size
In kernel/trace/trace_functions_graph.c, print_graph_duration(), len can be as low as 1 or 2, which could make snprintf() write beyond the buffer bounds. (Found by cppcheck, no real-world bug occured)
--- kernel/trace/trace_functions_graph.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
kernel/trace/trace_functions_graph.c +1 -1
@@ -281,7 +281,7 @@ print_graph_duration(unsigned long long duration, struct trace_seq *s)unsigned long nsecs_rem =do_div (duration,1000 );/* log10(ULONG_MAX) + '\0' */ char msecs_str[21 ]; -char nsecs_str[5 ]; +char nsecs_str[8 ];int ret, len;int i;
Signature · 1 line
1.6.2
Quoted 5 lines · Daniel Mack
In
kernel/trace/trace_functions_graph.c,print_graph_duration(), len can be as low as 1 or 2, which could makesnprintf()write beyond the buffer bounds. (Found by cppcheck, no real-world bug occured)Signed-off-by Daniel Mack <[email protected]>
Hi Daniel,
It can't really happen because nsecs_rem is a rest of a division per 1000, so it will not exceed 3 digits (so it should be [4] and not [5], btw).
I must confess I should have added a better comment on this area.
We are printing a duration in usec with a part in nsec with the following constraints:
_ never exceed 7 characters unless we are are upper 9999999 usecs _ always keep the usecs consistants
Which means that while we have 4 or lesser digits for the usecs, we can print the 3 digits of the nanosecs.
If we need 5 for usecs, drop the least significant nanosec digit. If we need 6 for usecs, drop the two least significant nanosec digits
6754.543 is correct
67545.543 must become 67545.54
etc...
That's why we have:
len = strlen(msecs_str);
/* Print nsecs (we don't want to exceed 7 numbers) */
if (len < 7) {
snprintf(nsecs_str, 8 - len, "%03lu", nsecs_rem);The 8 - len inside snprintf is not a security against overflow but a precision set. We know that it will never go upper 3 digits, but if we have 6 digits for usecs, we want only 8 - 6 = 2 nsecs
Hmm, may be it should be 7 -len. I don't remember. Anyway, this part must be fixed to handle msecs and align the row to the left...
Frederic.
Quoted 25 lines
--- kernel/trace/trace_functions_graph.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)kernel/trace/trace_functions_graph.c +1
-1@@ -281,7 +281,7 @@ print_graph_duration(unsigned long long duration, struct trace_seq *s)unsigned long nsecs_rem =do_div (duration,1000 );/* log10(ULONG_MAX) + '\0' */ char msecs_str[21 ]; -char nsecs_str[5 ]; +char nsecs_str[8 ];int ret, len;int i;Signature · 7 lines
1.6.2 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Hi Frederic,
Quoted 10 lines · Frederic Weisbecker
It can't really happen because
nsecs_remis a rest of a division per 1000, so it will not exceed 3 digits (so it should be [4] and not [5], btw).I must confess I should have added a better comment on this area.
We are printing a duration in usec with a part in nsec with the following constraints:
Quoted 8 lines
_ never exceed 7 characters unless we are are upper 9999999 usecs _ always keep the usecs consistants
Which means that while we have 4 or lesser digits for the usecs, we can print the 3 digits of the nanosecs.
If we need 5 for usecs, drop the least significant nanosec digit. If we need 6 for usecs, drop the two least significant nanosec digits
Ok, I see. I was just confused about the max len argument to snprintf() (and so was cppcheck), but at a closer look, this can't become a problem.
Nevermind, drop the patch - but good that we talked about it :)
Daniel
Commit-ID: 603b9b9081ae0a1af986b9059a0a5055876ddea9 Gitweb: http://git.kernel.org/tip/603b9b9081ae0a1af986b9059a0a5055876ddea9 Author: Daniel Mack <[email protected]> AuthorDate: Mon, 23 Mar 2009 17:10:37 +0100 Committer: Ingo Molnar <[email protected]> CommitDate: Mon, 23 Mar 2009 17:40:51 +0100
kernel/trace/trace_functions_graph.c: fix nsecs_str buffer size
Impact: fix currently inactive buffer-overflow
In kernel/trace/trace_functions_graph.c, print_graph_duration(), len can be as low as 1 or 2, which could make snprintf() write beyond the buffer bounds. (Found by cppcheck, no real-world bug occured)
LKML-Reference: <[email protected]>
--- kernel/trace/trace_functions_graph.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
kernel/trace/trace_functions_graph.c +1 -1
@@ -430,7 +430,7 @@ print_graph_duration(unsigned long long duration, struct trace_seq *s)unsigned long nsecs_rem =do_div (duration,1000 );/* log10(ULONG_MAX) + '\0' */ char msecs_str[21 ]; -char nsecs_str[5 ]; +char nsecs_str[8 ];int ret, len;int i;
Quoted 19 lines · Daniel Mack
Commit-ID: 603b9b9081ae0a1af986b9059a0a5055876ddea9 Gitweb: http://git.kernel.org/tip/603b9b9081ae0a1af986b9059a0a5055876ddea9 Author: Daniel Mack <[email protected]> AuthorDate: Mon, 23 Mar 2009 17:10:37 +0100 Committer: Ingo Molnar <[email protected]> CommitDate: Mon, 23 Mar 2009 17:40:51 +0100
kernel/trace/trace_functions_graph.c: fixnsecs_strbuffer sizeImpact: fix currently inactive buffer-overflow
In
kernel/trace/trace_functions_graph.c,print_graph_duration(), len can be as low as 1 or 2, which could makesnprintf()write beyond the buffer bounds. (Found by cppcheck, no real-world bug occured)Signed-off-by Daniel Mack <[email protected]>Cc Steven Rostedt <[email protected]>Cc Frederic Weisbecker <[email protected]>
Quoted 7 lines
LKML-Reference: <[email protected]>
Signed-off-by Ingo Molnar <[email protected]>--- kernel/trace/trace_functions_graph.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
Ingo, as I explained to Daniel before (I should have Cc you), there is no overflow to protect here, so this patch will not change anything.
This is my bad, I should better comment my code.
Frederic.
Quoted 13 lines
kernel/trace/trace_functions_graph.c +1
-1@@ -430,7 +430,7 @@ print_graph_duration(unsigned long long duration, struct trace_seq *s)unsigned long nsecs_rem =do_div (duration,1000 );/* log10(ULONG_MAX) + '\0' */ char msecs_str[21 ]; -char nsecs_str[5 ]; +char nsecs_str[8 ];int ret, len;int i;
Quoted 30 lines · Frederic Weisbecker
Quoted 19 lines · Daniel Mack
Commit-ID: 603b9b9081ae0a1af986b9059a0a5055876ddea9 Gitweb: http://git.kernel.org/tip/603b9b9081ae0a1af986b9059a0a5055876ddea9 Author: Daniel Mack <[email protected]> AuthorDate: Mon, 23 Mar 2009 17:10:37 +0100 Committer: Ingo Molnar <[email protected]> CommitDate: Mon, 23 Mar 2009 17:40:51 +0100
kernel/trace/trace_functions_graph.c: fixnsecs_strbuffer sizeImpact: fix currently inactive buffer-overflow
In
kernel/trace/trace_functions_graph.c,print_graph_duration(), len can be as low as 1 or 2, which could makesnprintf()write beyond the buffer bounds. (Found by cppcheck, no real-world bug occured)Signed-off-by Daniel Mack <[email protected]>Cc Steven Rostedt <[email protected]>Cc Frederic Weisbecker <[email protected]>Quoted 7 lines
LKML-Reference: <[email protected]>
Signed-off-by Ingo Molnar <[email protected]>--- kernel/trace/trace_functions_graph.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
Quoted 5 lines
Ingo, as I explained to Daniel before (I should have Cc you), there is no overflow to protect here, so this patch will not change anything.
This is my bad, I should better comment my code.
Yeah - saw your reply, and zapped the commit already. Please add a comment in any case.
Ingo