Add address and reason for IN_PAGE_ERROR.
ACCESS_VIOLATION and IN_PAGE_ERROR both specify read/write/dep flags and address. ACCESS_VIOLATION currently reports these, but IN_PAGE_ERROR does not. This change makes IN_PAGE_ERROR report this information as well, and also the additional NTSTATUS value for the underlying cause. Patch by bungeman@chromium.org Review URL: https://breakpad.appspot.com/1794002/ git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1441 4c0a9323-5329-0410-9bdc-e9ce6186880e
This commit is contained in:
parent
cfdf7cf8a9
commit
cd6f90524a
7 changed files with 8683 additions and 5 deletions
|
@ -266,6 +266,8 @@ src_libbreakpad_a_SOURCES = \
|
|||
src/processor/static_map.h \
|
||||
src/processor/static_range_map-inl.h \
|
||||
src/processor/static_range_map.h \
|
||||
src/processor/symbolic_constants_win.cc \
|
||||
src/processor/symbolic_constants_win.h \
|
||||
src/processor/tokenize.cc \
|
||||
src/processor/tokenize.h
|
||||
|
||||
|
@ -722,6 +724,7 @@ src_processor_exploitability_unittest_LDADD = \
|
|||
src/processor/stackwalker_ppc64.o \
|
||||
src/processor/stackwalker_sparc.o \
|
||||
src/processor/stackwalker_x86.o \
|
||||
src/processor/symbolic_constants_win.o \
|
||||
src/processor/tokenize.o \
|
||||
src/third_party/libdisasm/libdisasm.a \
|
||||
$(PTHREAD_CFLAGS) $(PTHREAD_LIBS)
|
||||
|
@ -856,6 +859,7 @@ src_processor_minidump_processor_unittest_LDADD = \
|
|||
src/processor/stackwalker_ppc64.o \
|
||||
src/processor/stackwalker_sparc.o \
|
||||
src/processor/stackwalker_x86.o \
|
||||
src/processor/symbolic_constants_win.o \
|
||||
src/processor/tokenize.o \
|
||||
src/third_party/libdisasm/libdisasm.a \
|
||||
$(PTHREAD_CFLAGS) $(PTHREAD_LIBS)
|
||||
|
@ -1201,6 +1205,7 @@ src_processor_minidump_stackwalk_LDADD = \
|
|||
src/processor/stackwalker_ppc64.o \
|
||||
src/processor/stackwalker_sparc.o \
|
||||
src/processor/stackwalker_x86.o \
|
||||
src/processor/symbolic_constants_win.o \
|
||||
src/processor/tokenize.o \
|
||||
src/third_party/libdisasm/libdisasm.a
|
||||
|
||||
|
|
19
Makefile.in
19
Makefile.in
|
@ -433,8 +433,10 @@ am__src_libbreakpad_a_SOURCES_DIST = \
|
|||
src/processor/static_map_iterator.h \
|
||||
src/processor/static_map-inl.h src/processor/static_map.h \
|
||||
src/processor/static_range_map-inl.h \
|
||||
src/processor/static_range_map.h src/processor/tokenize.cc \
|
||||
src/processor/tokenize.h
|
||||
src/processor/static_range_map.h \
|
||||
src/processor/symbolic_constants_win.cc \
|
||||
src/processor/symbolic_constants_win.h \
|
||||
src/processor/tokenize.cc src/processor/tokenize.h
|
||||
@DISABLE_PROCESSOR_FALSE@am_src_libbreakpad_a_OBJECTS = src/processor/basic_code_modules.$(OBJEXT) \
|
||||
@DISABLE_PROCESSOR_FALSE@ src/processor/basic_source_line_resolver.$(OBJEXT) \
|
||||
@DISABLE_PROCESSOR_FALSE@ src/processor/binarystream.$(OBJEXT) \
|
||||
|
@ -470,6 +472,7 @@ am__src_libbreakpad_a_SOURCES_DIST = \
|
|||
@DISABLE_PROCESSOR_FALSE@ src/processor/stackwalker_ppc64.$(OBJEXT) \
|
||||
@DISABLE_PROCESSOR_FALSE@ src/processor/stackwalker_sparc.$(OBJEXT) \
|
||||
@DISABLE_PROCESSOR_FALSE@ src/processor/stackwalker_x86.$(OBJEXT) \
|
||||
@DISABLE_PROCESSOR_FALSE@ src/processor/symbolic_constants_win.$(OBJEXT) \
|
||||
@DISABLE_PROCESSOR_FALSE@ src/processor/tokenize.$(OBJEXT)
|
||||
src_libbreakpad_a_OBJECTS = $(am_src_libbreakpad_a_OBJECTS)
|
||||
src_third_party_libdisasm_libdisasm_a_AR = $(AR) $(ARFLAGS)
|
||||
|
@ -862,6 +865,7 @@ src_processor_exploitability_unittest_OBJECTS = \
|
|||
@DISABLE_PROCESSOR_FALSE@ src/processor/stackwalker_ppc64.o \
|
||||
@DISABLE_PROCESSOR_FALSE@ src/processor/stackwalker_sparc.o \
|
||||
@DISABLE_PROCESSOR_FALSE@ src/processor/stackwalker_x86.o \
|
||||
@DISABLE_PROCESSOR_FALSE@ src/processor/symbolic_constants_win.o \
|
||||
@DISABLE_PROCESSOR_FALSE@ src/processor/tokenize.o \
|
||||
@DISABLE_PROCESSOR_FALSE@ src/third_party/libdisasm/libdisasm.a \
|
||||
@DISABLE_PROCESSOR_FALSE@ $(am__DEPENDENCIES_1) \
|
||||
|
@ -1022,6 +1026,7 @@ src_processor_minidump_processor_unittest_OBJECTS = \
|
|||
@DISABLE_PROCESSOR_FALSE@ src/processor/stackwalker_ppc64.o \
|
||||
@DISABLE_PROCESSOR_FALSE@ src/processor/stackwalker_sparc.o \
|
||||
@DISABLE_PROCESSOR_FALSE@ src/processor/stackwalker_x86.o \
|
||||
@DISABLE_PROCESSOR_FALSE@ src/processor/symbolic_constants_win.o \
|
||||
@DISABLE_PROCESSOR_FALSE@ src/processor/tokenize.o \
|
||||
@DISABLE_PROCESSOR_FALSE@ src/third_party/libdisasm/libdisasm.a \
|
||||
@DISABLE_PROCESSOR_FALSE@ $(am__DEPENDENCIES_1) \
|
||||
|
@ -1063,6 +1068,7 @@ src_processor_minidump_stackwalk_OBJECTS = \
|
|||
@DISABLE_PROCESSOR_FALSE@ src/processor/stackwalker_ppc64.o \
|
||||
@DISABLE_PROCESSOR_FALSE@ src/processor/stackwalker_sparc.o \
|
||||
@DISABLE_PROCESSOR_FALSE@ src/processor/stackwalker_x86.o \
|
||||
@DISABLE_PROCESSOR_FALSE@ src/processor/symbolic_constants_win.o \
|
||||
@DISABLE_PROCESSOR_FALSE@ src/processor/tokenize.o \
|
||||
@DISABLE_PROCESSOR_FALSE@ src/third_party/libdisasm/libdisasm.a
|
||||
am__src_processor_minidump_unittest_SOURCES_DIST = \
|
||||
|
@ -2060,6 +2066,8 @@ lib_LIBRARIES = $(am__append_5) $(am__append_8)
|
|||
@DISABLE_PROCESSOR_FALSE@ src/processor/static_map.h \
|
||||
@DISABLE_PROCESSOR_FALSE@ src/processor/static_range_map-inl.h \
|
||||
@DISABLE_PROCESSOR_FALSE@ src/processor/static_range_map.h \
|
||||
@DISABLE_PROCESSOR_FALSE@ src/processor/symbolic_constants_win.cc \
|
||||
@DISABLE_PROCESSOR_FALSE@ src/processor/symbolic_constants_win.h \
|
||||
@DISABLE_PROCESSOR_FALSE@ src/processor/tokenize.cc \
|
||||
@DISABLE_PROCESSOR_FALSE@ src/processor/tokenize.h
|
||||
|
||||
|
@ -2421,6 +2429,7 @@ TESTS = $(check_PROGRAMS) $(check_SCRIPTS)
|
|||
@DISABLE_PROCESSOR_FALSE@ src/processor/stackwalker_ppc64.o \
|
||||
@DISABLE_PROCESSOR_FALSE@ src/processor/stackwalker_sparc.o \
|
||||
@DISABLE_PROCESSOR_FALSE@ src/processor/stackwalker_x86.o \
|
||||
@DISABLE_PROCESSOR_FALSE@ src/processor/symbolic_constants_win.o \
|
||||
@DISABLE_PROCESSOR_FALSE@ src/processor/tokenize.o \
|
||||
@DISABLE_PROCESSOR_FALSE@ src/third_party/libdisasm/libdisasm.a \
|
||||
@DISABLE_PROCESSOR_FALSE@ $(PTHREAD_CFLAGS) $(PTHREAD_LIBS)
|
||||
|
@ -2565,6 +2574,7 @@ TESTS = $(check_PROGRAMS) $(check_SCRIPTS)
|
|||
@DISABLE_PROCESSOR_FALSE@ src/processor/stackwalker_ppc64.o \
|
||||
@DISABLE_PROCESSOR_FALSE@ src/processor/stackwalker_sparc.o \
|
||||
@DISABLE_PROCESSOR_FALSE@ src/processor/stackwalker_x86.o \
|
||||
@DISABLE_PROCESSOR_FALSE@ src/processor/symbolic_constants_win.o \
|
||||
@DISABLE_PROCESSOR_FALSE@ src/processor/tokenize.o \
|
||||
@DISABLE_PROCESSOR_FALSE@ src/third_party/libdisasm/libdisasm.a \
|
||||
@DISABLE_PROCESSOR_FALSE@ $(PTHREAD_CFLAGS) $(PTHREAD_LIBS)
|
||||
|
@ -2938,6 +2948,7 @@ TESTS = $(check_PROGRAMS) $(check_SCRIPTS)
|
|||
@DISABLE_PROCESSOR_FALSE@ src/processor/stackwalker_ppc64.o \
|
||||
@DISABLE_PROCESSOR_FALSE@ src/processor/stackwalker_sparc.o \
|
||||
@DISABLE_PROCESSOR_FALSE@ src/processor/stackwalker_x86.o \
|
||||
@DISABLE_PROCESSOR_FALSE@ src/processor/symbolic_constants_win.o \
|
||||
@DISABLE_PROCESSOR_FALSE@ src/processor/tokenize.o \
|
||||
@DISABLE_PROCESSOR_FALSE@ src/third_party/libdisasm/libdisasm.a
|
||||
|
||||
|
@ -3402,6 +3413,9 @@ src/processor/stackwalker_sparc.$(OBJEXT): \
|
|||
src/processor/stackwalker_x86.$(OBJEXT): \
|
||||
src/processor/$(am__dirstamp) \
|
||||
src/processor/$(DEPDIR)/$(am__dirstamp)
|
||||
src/processor/symbolic_constants_win.$(OBJEXT): \
|
||||
src/processor/$(am__dirstamp) \
|
||||
src/processor/$(DEPDIR)/$(am__dirstamp)
|
||||
src/processor/tokenize.$(OBJEXT): src/processor/$(am__dirstamp) \
|
||||
src/processor/$(DEPDIR)/$(am__dirstamp)
|
||||
src/$(am__dirstamp):
|
||||
|
@ -4525,6 +4539,7 @@ distclean-compile:
|
|||
@AMDEP_TRUE@@am__include@ @am__quote@src/processor/$(DEPDIR)/stackwalker_selftest.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@src/processor/$(DEPDIR)/stackwalker_sparc.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@src/processor/$(DEPDIR)/stackwalker_x86.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@src/processor/$(DEPDIR)/symbolic_constants_win.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@src/processor/$(DEPDIR)/tokenize.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@src/testing/gtest/src/$(DEPDIR)/src_client_linux_linux_client_unittest_shlib-gtest-all.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@src/testing/gtest/src/$(DEPDIR)/src_client_linux_linux_client_unittest_shlib-gtest_main.Po@am__quote@
|
||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -43,6 +43,7 @@
|
|||
#include "google_breakpad/processor/stack_frame_symbolizer.h"
|
||||
#include "processor/logging.h"
|
||||
#include "processor/stackwalker_x86.h"
|
||||
#include "processor/symbolic_constants_win.h"
|
||||
|
||||
namespace google_breakpad {
|
||||
|
||||
|
@ -1015,8 +1016,8 @@ string MinidumpProcessor::GetCrashReason(Minidump *dump, uint64_t *address) {
|
|||
// For EXCEPTION_ACCESS_VIOLATION, Windows puts the address that
|
||||
// caused the fault in exception_information[1].
|
||||
// exception_information[0] is 0 if the violation was caused by
|
||||
// an attempt to read data and 1 if it was an attempt to write
|
||||
// data.
|
||||
// an attempt to read data, 1 if it was an attempt to write data,
|
||||
// and 8 if this was a data execution violation.
|
||||
// This information is useful in addition to the code address, which
|
||||
// will be present in the crash thread's instruction field anyway.
|
||||
if (raw_exception->exception_record.number_parameters >= 1) {
|
||||
|
@ -1047,8 +1048,49 @@ string MinidumpProcessor::GetCrashReason(Minidump *dump, uint64_t *address) {
|
|||
}
|
||||
break;
|
||||
case MD_EXCEPTION_CODE_WIN_IN_PAGE_ERROR:
|
||||
// For EXCEPTION_IN_PAGE_ERROR, Windows puts the address that
|
||||
// caused the fault in exception_information[1].
|
||||
// exception_information[0] is 0 if the violation was caused by
|
||||
// an attempt to read data, 1 if it was an attempt to write data,
|
||||
// and 8 if this was a data execution violation.
|
||||
// exception_information[2] contains the underlying NTSTATUS code,
|
||||
// which is the explanation for why this error occured.
|
||||
// This information is useful in addition to the code address, which
|
||||
// will be present in the crash thread's instruction field anyway.
|
||||
if (raw_exception->exception_record.number_parameters >= 1) {
|
||||
MDInPageErrorTypeWin av_type =
|
||||
static_cast<MDInPageErrorTypeWin>
|
||||
(raw_exception->exception_record.exception_information[0]);
|
||||
switch (av_type) {
|
||||
case MD_IN_PAGE_ERROR_WIN_READ:
|
||||
reason = "EXCEPTION_IN_PAGE_ERROR_READ";
|
||||
break;
|
||||
case MD_IN_PAGE_ERROR_WIN_WRITE:
|
||||
reason = "EXCEPTION_IN_PAGE_ERROR_WRITE";
|
||||
break;
|
||||
case MD_IN_PAGE_ERROR_WIN_EXEC:
|
||||
reason = "EXCEPTION_IN_PAGE_ERROR_EXEC";
|
||||
break;
|
||||
default:
|
||||
reason = "EXCEPTION_IN_PAGE_ERROR";
|
||||
break;
|
||||
}
|
||||
} else {
|
||||
reason = "EXCEPTION_IN_PAGE_ERROR";
|
||||
}
|
||||
if (address &&
|
||||
raw_exception->exception_record.number_parameters >= 2) {
|
||||
*address =
|
||||
raw_exception->exception_record.exception_information[1];
|
||||
}
|
||||
if (raw_exception->exception_record.number_parameters >= 3) {
|
||||
uint32_t ntstatus =
|
||||
static_cast<uint32_t>
|
||||
(raw_exception->exception_record.exception_information[2]);
|
||||
reason.append(" / ");
|
||||
reason.append(NTStatusToString(ntstatus));
|
||||
}
|
||||
break;
|
||||
case MD_EXCEPTION_CODE_WIN_INVALID_HANDLE:
|
||||
reason = "EXCEPTION_INVALID_HANDLE";
|
||||
break;
|
||||
|
|
|
@ -89,6 +89,8 @@
|
|||
'source_line_resolver_base_types.h',
|
||||
'stack_frame_cpu.cc',
|
||||
'stack_frame_symbolizer.cc',
|
||||
'stackwalk_common.cc',
|
||||
'stackwalk_common.h',
|
||||
'stackwalker.cc',
|
||||
'stackwalker_address_list.cc',
|
||||
'stackwalker_address_list.h',
|
||||
|
@ -119,6 +121,8 @@
|
|||
'static_map_iterator.h',
|
||||
'static_range_map-inl.h',
|
||||
'static_range_map.h',
|
||||
'symbolic_constants_win.cc',
|
||||
'symbolic_constants_win.h',
|
||||
'synth_minidump.cc',
|
||||
'synth_minidump.h',
|
||||
'tokenize.cc',
|
||||
|
|
6417
src/processor/symbolic_constants_win.cc
Normal file
6417
src/processor/symbolic_constants_win.cc
Normal file
File diff suppressed because it is too large
Load diff
50
src/processor/symbolic_constants_win.h
Normal file
50
src/processor/symbolic_constants_win.h
Normal file
|
@ -0,0 +1,50 @@
|
|||
// Copyright (c) 2015 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
|
||||
// copyright notice, this list of conditions and the following disclaimer
|
||||
// in the documentation and/or other materials provided with the
|
||||
// distribution.
|
||||
// * Neither the name of Google Inc. nor the names of its
|
||||
// contributors may be used to endorse or promote products derived from
|
||||
// this software without specific prior written permission.
|
||||
//
|
||||
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
||||
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||
// 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.
|
||||
|
||||
// ntstatus_reason_win.h: Windows NTSTATUS code to string.
|
||||
//
|
||||
// Provides a means to convert NTSTATUS codes to strings.
|
||||
//
|
||||
// Author: Ben Wagner
|
||||
|
||||
#ifndef GOOGLE_BREAKPAD_PROCESSOR_SYMBOLIC_CONSTANTS_WIN_H_
|
||||
#define GOOGLE_BREAKPAD_PROCESSOR_SYMBOLIC_CONSTANTS_WIN_H_
|
||||
|
||||
#include <string>
|
||||
|
||||
#include "google_breakpad/common/breakpad_types.h"
|
||||
|
||||
namespace google_breakpad {
|
||||
|
||||
/* Converts a NTSTATUS code to a reason string. */
|
||||
std::string NTStatusToString(uint32_t ntstatus);
|
||||
|
||||
} // namespace google_breakpad
|
||||
|
||||
#endif // GOOGLE_BREAKPAD_PROCESSOR_SYMBOLIC_CONSTANTS_WIN_H_
|
Loading…
Reference in a new issue