diff options
author | Sandra Loosemore <sandra@codesourcery.com> | 2016-10-26 12:12:01 -0500 |
---|---|---|
committer | Pedro Alves <palves@redhat.com> | 2016-10-26 16:47:46 +0100 |
commit | ecf45d2cc7667ed4692d07e52fc77a2c9a8adf1c (patch) | |
tree | abc757e04ab221b35d3d0db5afba7f9f82da645a /gdb/main.c | |
parent | b15cc25cbe7c13e450f77b4a309223b9b3da3936 (diff) | |
download | gdb-ecf45d2cc7667ed4692d07e52fc77a2c9a8adf1c.zip gdb-ecf45d2cc7667ed4692d07e52fc77a2c9a8adf1c.tar.gz gdb-ecf45d2cc7667ed4692d07e52fc77a2c9a8adf1c.tar.bz2 |
PR 20569, segv in follow_exec
The following testcases make GDB crash whenever an invalid sysroot is
provided, when GDB is unable to find a valid path to the symbol file:
gdb.base/catch-syscall.exp
gdb.base/execl-update-breakpoints.exp
gdb.base/foll-exec-mode.exp
gdb.base/foll-exec.exp
gdb.base/foll-vfork.exp
gdb.base/pie-execl.exp
gdb.multi/bkpt-multi-exec.exp
gdb.python/py-finish-breakpoint.exp
gdb.threads/execl.exp
gdb.threads/non-ldr-exc-1.exp
gdb.threads/non-ldr-exc-2.exp
gdb.threads/non-ldr-exc-3.exp
gdb.threads/non-ldr-exc-4.exp
gdb.threads/thread-execl.exp
The immediate cause of the segv is that follow_exec is passing a NULL
argument (the result of exec_file_find) to strlen.
However, the problem is deeper than that: follow_exec simply isn't
prepared for the case where sysroot translation fails to locate the
new executable. Actually all callers of exec_file_find have bugs due
to confusion between host and target pathnames. This commit attempts
to fix all that.
In terms of the testcases that were formerly segv'ing, GDB now prints
a warning but continues execution of the new program, so that the
tests now mostly FAIL instead. You could argue the FAILs are due to a
legitimate problem with the test environment setting up the sysroot
translation incorrectly.
A new representative test is added which exercises the ne wwarning
code path even with native testing.
Tested on x86_64 Fedora 23, native and gdbserver.
gdb/ChangeLog:
2016-10-25 Sandra Loosemore <sandra@codesourcery.com>
Luis Machado <lgustavo@codesourcery.com>
Pedro Alves <palves@redhat.com>
PR gdb/20569
* exceptions.c (exception_print_same): Moved here from exec.c.
* exceptions.h (exception_print_same): Declare.
* exec.h: Include "symfile-add-flags.h".
(try_open_exec_file): New declaration.
* exec.c (exception_print_same): Moved to exceptions.c.
(try_open_exec_file): New function.
(exec_file_locate_attach): Rename exec_file and full_exec_path
variables to avoid confusion between target and host pathnames.
Move pathname processing logic to exec_file_find. Do not return
early if pathname lookup fails; Call try_open_exec_file.
* infrun.c (follow_exec): Split and rename execd_pathname variable
to avoid confusion between target and host pathnames. Warn if
pathname lookup fails. Pass target pathname to
target_follow_exec, not hostpathname. Call try_open_exec_file.
* main.c (symbol_file_add_main_adapter): New function.
(captured_main_1): Use it.
* solib-svr4.c (open_symbol_file_object): Adjust to pass
symfile_add_flags to symbol_file_add_main.
* solib.c (exec_file_find): Incorporate fallback logic for relative
pathnames formerly in exec_file_locate_attach.
* symfile.c (symbol_file_add_main, symbol_file_add_main_1):
Replace 'from_tty' parameter with a symfile_add_file.
(symbol_file_command): Adjust to pass symfile_add_flags to
symbol_file_add_main.
* symfile.h (symbol_file_add_main): Replace 'from_tty' parameter
with a symfile_add_file.
gdb/testsuite/ChangeLog:
2016-10-25 Luis Machado <lgustavo@codesourcery.com>
* gdb.base/exec-invalid-sysroot.exp: New file.
Diffstat (limited to 'gdb/main.c')
-rw-r--r-- | gdb/main.c | 18 |
1 files changed, 16 insertions, 2 deletions
@@ -413,6 +413,20 @@ catch_command_errors_const (catch_command_errors_const_ftype *command, return 1; } +/* Adapter for symbol_file_add_main that translates 'from_tty' to a + symfile_add_flags. */ + +static void +symbol_file_add_main_adapter (const char *arg, int from_tty) +{ + symfile_add_flags add_flags = 0; + + if (from_tty) + add_flags |= SYMFILE_VERBOSE; + + symbol_file_add_main (arg, add_flags); +} + /* Type of this option. */ enum cmdarg_kind { @@ -1029,7 +1043,7 @@ captured_main_1 (struct captured_main_args *context) catch_command_errors returns non-zero on success! */ if (catch_command_errors_const (exec_file_attach, execarg, !batch_flag)) - catch_command_errors_const (symbol_file_add_main, symarg, + catch_command_errors_const (symbol_file_add_main_adapter, symarg, !batch_flag); } else @@ -1038,7 +1052,7 @@ captured_main_1 (struct captured_main_args *context) catch_command_errors_const (exec_file_attach, execarg, !batch_flag); if (symarg != NULL) - catch_command_errors_const (symbol_file_add_main, symarg, + catch_command_errors_const (symbol_file_add_main_adapter, symarg, !batch_flag); } |