|
 |
01add4 |
From 1c223116114ddf80609e79ec7ada0ec4a5a463f3 Mon Sep 17 00:00:00 2001
|
|
|
01add4 |
From: Martin Milata <mmilata@redhat.com>
|
|
|
01add4 |
Date: Wed, 27 Aug 2014 12:51:41 +0200
|
|
|
01add4 |
Subject: [SATYR PATCH 5/6] unwind: limit the number of frames unwound
|
|
|
01add4 |
|
|
|
01add4 |
Fixes rhbz#1133907.
|
|
|
01add4 |
|
|
|
01add4 |
Signed-off-by: Martin Milata <mmilata@redhat.com>
|
|
|
01add4 |
---
|
|
|
01add4 |
lib/core_unwind_elfutils.c | 15 +++++++++++++--
|
|
|
01add4 |
1 file changed, 13 insertions(+), 2 deletions(-)
|
|
|
01add4 |
|
|
|
01add4 |
diff --git a/lib/core_unwind_elfutils.c b/lib/core_unwind_elfutils.c
|
|
|
01add4 |
index 6b904c7..43d66be 100644
|
|
|
01add4 |
--- a/lib/core_unwind_elfutils.c
|
|
|
01add4 |
+++ b/lib/core_unwind_elfutils.c
|
|
|
01add4 |
@@ -29,10 +29,13 @@
|
|
|
01add4 |
#include <stdio.h>
|
|
|
01add4 |
#include <string.h>
|
|
|
01add4 |
|
|
|
01add4 |
+#define FRAME_LIMIT 1024
|
|
|
01add4 |
+
|
|
|
01add4 |
struct frame_callback_arg
|
|
|
01add4 |
{
|
|
|
01add4 |
struct sr_core_thread *thread;
|
|
|
01add4 |
char *error_msg;
|
|
|
01add4 |
+ unsigned nframes;
|
|
|
01add4 |
};
|
|
|
01add4 |
|
|
|
01add4 |
struct thread_callback_arg
|
|
|
01add4 |
@@ -41,7 +44,7 @@ struct thread_callback_arg
|
|
|
01add4 |
char *error_msg;
|
|
|
01add4 |
};
|
|
|
01add4 |
|
|
|
01add4 |
-static int CB_STOP_UNWIND = DWARF_CB_ABORT+1;
|
|
|
01add4 |
+static const int CB_STOP_UNWIND = DWARF_CB_ABORT+1;
|
|
|
01add4 |
|
|
|
01add4 |
static int
|
|
|
01add4 |
frame_callback(Dwfl_Frame *frame, void *data)
|
|
|
01add4 |
@@ -70,6 +73,13 @@ frame_callback(Dwfl_Frame *frame, void *data)
|
|
|
01add4 |
frame_arg->thread->frames =
|
|
|
01add4 |
sr_core_frame_append(frame_arg->thread->frames, result);
|
|
|
01add4 |
|
|
|
01add4 |
+ /* Avoid huge stacktraces from programs stuck in infinite recursion. */
|
|
|
01add4 |
+ frame_arg->nframes++;
|
|
|
01add4 |
+ if (frame_arg->nframes >= FRAME_LIMIT)
|
|
|
01add4 |
+ {
|
|
|
01add4 |
+ return CB_STOP_UNWIND;
|
|
|
01add4 |
+ }
|
|
|
01add4 |
+
|
|
|
01add4 |
return DWARF_CB_OK;
|
|
|
01add4 |
}
|
|
|
01add4 |
|
|
|
01add4 |
@@ -90,7 +100,8 @@ unwind_thread(Dwfl_Thread *thread, void *data)
|
|
|
01add4 |
struct frame_callback_arg frame_arg =
|
|
|
01add4 |
{
|
|
|
01add4 |
.thread = result,
|
|
|
01add4 |
- .error_msg = NULL
|
|
|
01add4 |
+ .error_msg = NULL,
|
|
|
01add4 |
+ .nframes = 0
|
|
|
01add4 |
};
|
|
|
01add4 |
|
|
|
01add4 |
int ret = dwfl_thread_getframes(thread, frame_callback, &frame_arg);
|
|
|
01add4 |
--
|
|
|
01add4 |
1.9.3
|
|
|
01add4 |
|