Merge branch 'master' of ssh://sources.redhat.com/git/systemtap

* 'master' of ssh://sources.redhat.com/git/systemtap:
  backtrace fix for i386 with neither frame pointers nor dwarf unwinding
  Add network security warning for the client/server.
  Check for dwarf_getelf (elfutils 0.126+).
  hangeLog entries for latest commits.
  Move stap-find-* script to client sub rpm.
  Rename _stp_module module_base output to dwarf_module_base and document.
  Remove unnecessary dependencies.
  Correct man page specs in systemtap.spec
  Create systemtap-client and systemtap-server sub rpms

1 files changed, 4 insertions, 2 deletions

diff --git a/runtime/unwind.c b/runtime/unwind.c
index db8ae664..bc8a93dc 100644
--- a/runtime/unwind.c
+++ b/runtime/unwind.c
@@ -550,7 +550,9 @@ static int processCFI(const u8 *start, const u8 *end, unsigned long targetLoc, s
 	return result && ptr.p8 == end && (targetLoc == 0 || state->label == NULL);
 }
 
-// This is an address inside a module, adjust.
+// If this is an address inside a module, adjust for section relocation
+// and the elfutils base relocation done during loading of the .dwarf_frame
+// in translate.cxx.
 static unsigned long
 adjustStartLoc (unsigned long startLoc,
 		struct _stp_module *m,
@@ -560,7 +562,7 @@ adjustStartLoc (unsigned long startLoc,
     {
       startLoc = _stp_module_relocate (m->name, s->name,
 				       startLoc);
-      startLoc -= m->module_base;
+      startLoc -= m->dwarf_module_base;
     }
   return startLoc;
 }