Changeset 6bb136b2 in mainline

Timestamp:

2018-07-31T12:32:34Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

b79903b, d742db21

Parents:

d4b7b29

git-author:

Jiri Svoboda <jiri@…> (2018-07-30 20:18:16)

git-committer:

Jiri Svoboda <jiri@…> (2018-07-31 12:32:34)

Message:

Limit userspace stack trace depth.

Location:

uspace

Files:

• app/taskdump/taskdump.c (modified) (3 diffs)
• lib/c/generic/stacktrace.c (modified) (3 diffs)

uspace/app/taskdump/taskdump.c

@@ -56 +56 @@
 
 #define LINE_BYTES 16
+#define STACK_FRAMES_MAX 20
 
 static async_sess_t *sess;
@@ -327 +328 @@
 errno_t td_stacktrace(uintptr_t fp, uintptr_t pc)
 {
+        int cnt = 0;
         uintptr_t nfp;
         stacktrace_t st;
@@ -335 +337 @@
         st.ops = &td_stacktrace_ops;
 
-        while (stacktrace_fp_valid(&st, fp)) {
+        while (cnt++ < STACK_FRAMES_MAX && stacktrace_fp_valid(&st, fp)) {
                 sym_pc = fmt_sym_address(pc);
                 printf("  %p: %s\n", (void *) fp, sym_pc);

uspace/lib/c/generic/stacktrace.c

@@ -41 +41 @@
 #include <io/kio.h>
 
+#define STACK_FRAMES_MAX 20
+
 static errno_t stacktrace_read_uintptr(void *arg, uintptr_t addr, uintptr_t *data);
 
@@ -56 +58 @@
     uintptr_t pc)
 {
+        int cnt = 0;
         stacktrace_t st;
         uintptr_t nfp;
@@ -63 +66 @@
         st.ops = ops;
 
-        while (stacktrace_fp_valid(&st, fp)) {
+        while (cnt++ < STACK_FRAMES_MAX && stacktrace_fp_valid(&st, fp)) {
                 ops->printf("%p: %p()\n", (void *) fp, (void *) pc);
                 rc =  stacktrace_ra_get(&st, fp, &pc);