Add linux-gate.so to the minidump mappings list by checking for the load addr....

breakpad/linux/linux_dumper.h

 // Copyright (c) 2009, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 // notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
@@ skipping 12 matching lines @@
 // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #ifndef CLIENT_LINUX_HANDLER_LINUX_DUMPER_H_
 #define CLIENT_LINUX_HANDLER_LINUX_DUMPER_H_
 
+#include <elf.h>
 #include <stdint.h>
 #include <sys/user.h>
 #include <linux/limits.h>
 
 #include "breakpad/linux/memory.h"
 
 namespace google_breakpad {
 
-typedef typeof(((struct user *) 0)->u_debugreg[0]) debugreg_t;
+typedef typeof(((struct user*) 0)->u_debugreg[0]) debugreg_t;
+
+// Typedef for our parsing of the auxv variables in /proc/pid/auxv.
+#if defined(__i386)
+typedef Elf32_auxv_t elf_aux_entry;
+#elif defined(__x86_64__)
+typedef Elf64_auxv_t elf_aux_entry;
+#endif
+// When we find the VDSO mapping in the process's address space, this
+// is the name we use for it when writing it to the minidump.
+// This should always be less than NAME_MAX!
+const char kLinuxGateLibraryName[] = "linux-gate.so";
 
 // We produce one of these structures for each thread in the crashed process.
 struct ThreadInfo {
   pid_t tgid;   // thread group id
   pid_t ppid;   // parent process
 
   // Even on platforms where the stack grows down, the following will point to
   // the smallest address in the stack.
-  const void *stack;  // pointer to the stack area
+  const void* stack;  // pointer to the stack area
   size_t stack_len;  // length of the stack to copy
 
   user_regs_struct regs;
   user_fpregs_struct fpregs;
 #if defined(__i386) || defined(__x86_64)
   user_fpxregs_struct fpxregs;
 
   static const unsigned kNumDebugRegisters = 8;
   debugreg_t dregs[8];
 #endif
@@ skipping 14 matching lines @@
 
   // Parse the data for |threads| and |mappings|.
   bool Init();
 
   // Suspend/resume all threads in the given process.
   bool ThreadsSuspend();
   bool ThreadsResume();
 
   // Read information about the given thread. Returns true on success. One must
   // have called |ThreadsSuspend| first.
-  bool ThreadInfoGet(pid_t tid, ThreadInfo *info);
+  bool ThreadInfoGet(pid_t tid, ThreadInfo* info);
 
   // These are only valid after a call to |Init|.
   const wasteful_vector<pid_t> &threads() { return threads_; }
   const wasteful_vector<MappingInfo*> &mappings() { return mappings_; }
-  const MappingInfo *FindMapping(const void *address) const;
+  const MappingInfo* FindMapping(const void* address) const;
 
   // Find a block of memory to take as the stack given the top of stack pointer.
   //   stack: (output) the lowest address in the memory area
   //   stack_len: (output) the length of the memory area
   //   stack_top: the current top of the stack
   bool GetStackInfo(const void** stack, size_t* stack_len, uintptr_t stack_top);
 
-  PageAllocator *allocator() { return &allocator_; }
+  PageAllocator* allocator() { return &allocator_; }
 
   // memcpy from a remote process.
   static void CopyFromProcess(void* dest, pid_t child, const void* src,
                               size_t length);
 
+  // Builds a proc path for a certain pid for a node.  path is a
+  // character array that is overwritten, and node is the final node
+  // without any slashes.
+  void BuildProcPath(char* path, pid_t pid, const char* node) const;
+
+  // Utility method to find the location of where the kernel has
+  // mapped linux-gate.so in memory(shows up in /proc/pid/maps as
+  // [vdso], but we can't guarantee that it's the only virtual dynamic
+  // shared object.  Parsing the auxilary vector for AT_SYSINFO_EHDR
+  // is the safest way to go.)
+  void* FindBeginningOfLinuxGateSharedLibrary(const pid_t pid) const;
  private:
-  bool EnumerateMappings(wasteful_vector<MappingInfo*> *result) const;
-  bool EnumerateThreads(wasteful_vector<pid_t> *result) const;
+  bool EnumerateMappings(wasteful_vector<MappingInfo*>* result) const;
+  bool EnumerateThreads(wasteful_vector<pid_t>* result) const;
 
   const pid_t pid_;
 
   mutable PageAllocator allocator_;
 
   bool threads_suspened_;
   wasteful_vector<pid_t> threads_;  // the ids of all the threads
   wasteful_vector<MappingInfo*> mappings_;  // info from /proc/<pid>/maps
 };
 
 }  // namespace google_breakpad
 
 #endif  // CLIENT_LINUX_HANDLER_LINUX_DUMPER_H_