From patchwork Fri Oct 21 18:30:19 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luis Machado X-Patchwork-Id: 78706 Delivered-To: patch@linaro.org Received: by 10.140.97.247 with SMTP id m110csp1439739qge; Fri, 21 Oct 2016 11:30:44 -0700 (PDT) X-Received: by 10.99.131.66 with SMTP id h63mr3325424pge.103.1477074644877; Fri, 21 Oct 2016 11:30:44 -0700 (PDT) Return-Path: Received: from sourceware.org (server1.sourceware.org. [209.132.180.131]) by mx.google.com with ESMTPS id ef5si3063974pac.293.2016.10.21.11.30.44 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 21 Oct 2016 11:30:44 -0700 (PDT) Received-SPF: pass (google.com: domain of gdb-patches-return-134231-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) client-ip=209.132.180.131; Authentication-Results: mx.google.com; dkim=pass header.i=@sourceware.org; spf=pass (google.com: domain of gdb-patches-return-134231-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom=gdb-patches-return-134231-patch=linaro.org@sourceware.org DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:reply-to:subject:references:to:from:message-id :date:mime-version:in-reply-to:content-type; q=dns; s=default; b= pZcnfi7qcRZiCZkSiYSv1GcV4zYUgIKGrOgNtoWNqIz0MlQnlnTVMERUHo7CtXFY otfCQq/F5jM+JMJ2vXmjaG02abosGvJrsK/FnmrZIwWLiGqqElzqsyqpzj4+1VYn x/kcIFqLXPEmE66Sv4n84y6/0OEWmbK0TgavQLG2D10= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:reply-to:subject:references:to:from:message-id :date:mime-version:in-reply-to:content-type; s=default; bh=8Cqsd NBjWZ8s0BSZ66df4Fwin/I=; b=KF03pI9w7JePNOUEGLid0W/1bOVk89/cfVjD9 mIRlVIoRMeKnv8C4Nr1gkwk7qeY1fxQGc++yG+/Sid8fV/LEY69lNUkRmfpftlPJ WtCcf+7FrfpwxyAblEIQKq67cA+qOicqH53iinnBOyYcx7hAOQrGRBP21rIIAZ/m LF9v/s= Received: (qmail 130344 invoked by alias); 21 Oct 2016 18:30:36 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 130331 invoked by uid 89); 21 Oct 2016 18:30:35 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.9 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_NONE, SPF_PASS, URIBL_RED autolearn=ham version=3.3.2 spammy=srcdir, 1819, H*r:Fri, Yeah X-HELO: relay1.mentorg.com Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 21 Oct 2016 18:30:25 +0000 Received: from svr-orw-mbx-03.mgc.mentorg.com ([147.34.90.203]) by relay1.mentorg.com with esmtp id 1bxeaF-0000pj-IQ from Luis_Gustavo@mentor.com ; Fri, 21 Oct 2016 11:30:23 -0700 Received: from [172.30.3.42] (147.34.91.1) by svr-orw-mbx-03.mgc.mentorg.com (147.34.90.203) with Microsoft SMTP Server (TLS) id 15.0.1210.3; Fri, 21 Oct 2016 11:30:21 -0700 Reply-To: Luis Machado Subject: Re: [rfc] PR 20569, segv in follow_exec References: <57F6D57D.8070603@codesourcery.com> <50f4c7d8-44e3-4351-0b54-9cbaef64717a@codesourcery.com> <14a10c11-cda1-945c-560a-ee619fe59101@redhat.com> <91ae2166-15c4-d356-5b50-ecdd3402740d@codesourcery.com> <26518bd3-f378-74d2-bc26-fbdfd2a95f09@codesourcery.com> <5ee7b45e-2c00-8c6b-f77c-b2ec79e2a64f@redhat.com> To: Pedro Alves , Sandra Loosemore , From: Luis Machado Message-ID: <03b1ebad-2115-7479-358a-1046316d238b@codesourcery.com> Date: Fri, 21 Oct 2016 13:30:19 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.3.0 MIME-Version: 1.0 In-Reply-To: <5ee7b45e-2c00-8c6b-f77c-b2ec79e2a64f@redhat.com> X-ClientProxiedBy: svr-orw-mbx-03.mgc.mentorg.com (147.34.90.203) To svr-orw-mbx-03.mgc.mentorg.com (147.34.90.203) X-IsSubscribed: yes On 10/20/2016 06:27 PM, Pedro Alves wrote: > On 10/19/2016 09:19 PM, Luis Machado wrote: > >> I was thinking of a way to test this and decided to exercise everything >> against an invalid sysroot (by always passing 'set sysroot >> ' and i noticed quite a few segmentation faults >> ocurring in 10+ tests. >> >> Now we know things are broken and we know how to show that, but i'm >> wondering if we want to re-run tests with an invalid sysroot or if the >> manual testing with a sysroot override is enough. > > I think we should have some representative test that always runs, > without requiring manual testing. > >> >> I could add a loop to each test that is failing, but, though that >> exercises and shows the failure, it sounds like a waste of time to >> repeat those tests. > > Yeah. > >> >> I could also pick one candidate and isolate that in a test, but i'm not >> yet sure if all those 10+ failures fail for the same exact reason. >> >> Suggestions? > > I think it is sufficient to have one representative test for > each reasons (or reasons). Whether that is a new separate testcase > or whether we reuse some existing testcase, I guess depends on how > complicated the test needs to be. If trivial, maybe go for separate, > focused test. If a lot of test set up is needed, e.g., to get the > inferior to the state that triggers the bug), might make sense to > reuse some existing testcase. > > >> >> These are the failing tests: >> >> 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.linespec/explicit.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 obvious pattern here is that these are tests that exec. :-) > gdb.linespec/explicit.exp fails for an unrelated reason. It times out for me too, which is strange. Anyway, i came up with a small test mostly copied from gdb.base/foll-exec.exp. It does only one test to make sure gdb survives the exec event with crashing. I've confirmed it shows 1 FAIL without the attached patch and full passes with the patch applied. How does the test (and patch) look now? diff --git a/gdb/ChangeLog b/gdb/ChangeLog index a8ab8b0..629cc8a 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,26 @@ +2016-10-21 Sandra Loosemore + Luis Machado + + PR gdb/20569 + gdb/ + * exceptions.c (exception_print_same): Moved here from exec.c. + Fixed message comparison. + * exceptions.h (exception_print_same): Declare. + * exec_file_locate_attach (exception_print_same): Delete copy here. + (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; guard symbol_file_add_main call + instead. + * infrun.c (follow_exec): Split and rename execd_pathname variable + to avoid confusion between target and host pathnames. Replace + brokenpathname copy with cleanup to free malloc'ed string. Warn + if pathname lookup fails. Pass target pathname to + target_follow_exec, not hostpathname. Borrow exception-handling + logic from exec_file_locate_attach. + * solib.c (exec_file_find): Incorporate fallback logic for relative + pathnames formerly in exec_file_locate_attach. + 2016-10-21 Philipp Rudo * solist.h (struct target_so_ops): Delete special_symbol_handling diff --git a/gdb/exceptions.c b/gdb/exceptions.c index 9a10f66..402a5af 100644 --- a/gdb/exceptions.c +++ b/gdb/exceptions.c @@ -256,3 +256,16 @@ catch_errors (catch_errors_ftype *func, void *func_args, char *errstring, return 0; return val; } + +/* Returns non-zero if exceptions E1 and E2 are equal. Returns zero + otherwise. */ + +int +exception_print_same (struct gdb_exception e1, struct gdb_exception e2) +{ + return (e1.reason == e2.reason + && e1.error == e2.error + && (e1.message == e2.message + || (e1.message && e2.message + && strcmp (e1.message, e2.message) == 0))); +} diff --git a/gdb/exceptions.h b/gdb/exceptions.h index 5711c1a..a2d39d7 100644 --- a/gdb/exceptions.h +++ b/gdb/exceptions.h @@ -88,4 +88,7 @@ extern int catch_exceptions_with_msg (struct ui_out *uiout, typedef int (catch_errors_ftype) (void *); extern int catch_errors (catch_errors_ftype *, void *, char *, return_mask); +/* Compare two exception objects for print equality. */ +extern int exception_print_same (struct gdb_exception e1, + struct gdb_exception e2); #endif diff --git a/gdb/exec.c b/gdb/exec.c index d858e99..5c1abe0 100644 --- a/gdb/exec.c +++ b/gdb/exec.c @@ -139,39 +139,23 @@ exec_file_clear (int from_tty) /* Returns non-zero if exceptions E1 and E2 are equal. Returns zero otherwise. */ -static int -exception_print_same (struct gdb_exception e1, struct gdb_exception e2) -{ - const char *msg1 = e1.message; - const char *msg2 = e2.message; - - if (msg1 == NULL) - msg1 = ""; - if (msg2 == NULL) - msg2 = ""; - - return (e1.reason == e2.reason - && e1.error == e2.error - && strcmp (e1.message, e2.message) == 0); -} - /* See gdbcore.h. */ void exec_file_locate_attach (int pid, int defer_bp_reset, int from_tty) { - char *exec_file, *full_exec_path = NULL; + char *exec_file_target, *exec_file_host = NULL; struct cleanup *old_chain; struct gdb_exception prev_err = exception_none; /* Do nothing if we already have an executable filename. */ - exec_file = (char *) get_exec_file (0); - if (exec_file != NULL) + exec_file_target = (char *) get_exec_file (0); + if (exec_file_target != NULL) return; /* Try to determine a filename from the process itself. */ - exec_file = target_pid_to_exec_file (pid); - if (exec_file == NULL) + exec_file_target = target_pid_to_exec_file (pid); + if (exec_file_target == NULL) { warning (_("No executable has been specified and target does not " "support\n" @@ -180,28 +164,8 @@ exec_file_locate_attach (int pid, int defer_bp_reset, int from_tty) return; } - /* If gdb_sysroot is not empty and the discovered filename - is absolute then prefix the filename with gdb_sysroot. */ - if (*gdb_sysroot != '\0' && IS_ABSOLUTE_PATH (exec_file)) - { - full_exec_path = exec_file_find (exec_file, NULL); - if (full_exec_path == NULL) - return; - } - else - { - /* It's possible we don't have a full path, but rather just a - filename. Some targets, such as HP-UX, don't provide the - full path, sigh. - - Attempt to qualify the filename against the source path. - (If that fails, we'll just fall back on the original - filename. Not much more we can do...) */ - if (!source_full_path_of (exec_file, &full_exec_path)) - full_exec_path = xstrdup (exec_file); - } - - old_chain = make_cleanup (xfree, full_exec_path); + exec_file_host = exec_file_find (exec_file_target, NULL); + old_chain = make_cleanup (xfree, exec_file_host); make_cleanup (free_current_contents, &prev_err.message); /* exec_file_attach and symbol_file_add_main may throw an error if the file @@ -217,7 +181,9 @@ exec_file_locate_attach (int pid, int defer_bp_reset, int from_tty) errors/exceptions in the following code. */ TRY { - exec_file_attach (full_exec_path, from_tty); + /* We must do this step even if exec_file_host is NULL, so that + exec_file_attach will clear state. */ + exec_file_attach (exec_file_host, from_tty); } CATCH (err, RETURN_MASK_ERROR) { @@ -231,19 +197,22 @@ exec_file_locate_attach (int pid, int defer_bp_reset, int from_tty) } END_CATCH - TRY - { - if (defer_bp_reset) - current_inferior ()->symfile_flags |= SYMFILE_DEFER_BP_RESET; - symbol_file_add_main (full_exec_path, from_tty); - } - CATCH (err, RETURN_MASK_ERROR) + if (exec_file_host) { - if (!exception_print_same (prev_err, err)) - warning ("%s", err.message); - } - END_CATCH - current_inferior ()->symfile_flags &= ~SYMFILE_DEFER_BP_RESET; + TRY + { + if (defer_bp_reset) + current_inferior ()->symfile_flags |= SYMFILE_DEFER_BP_RESET; + symbol_file_add_main (exec_file_host, from_tty); + } + CATCH (err, RETURN_MASK_ERROR) + { + if (!exception_print_same (prev_err, err)) + warning ("%s", err.message); + } + END_CATCH + current_inferior ()->symfile_flags &= ~SYMFILE_DEFER_BP_RESET; + } do_cleanups (old_chain); } diff --git a/gdb/infrun.c b/gdb/infrun.c index 2636a19..cb9d5ab 100644 --- a/gdb/infrun.c +++ b/gdb/infrun.c @@ -1077,15 +1077,18 @@ show_follow_exec_mode_string (struct ui_file *file, int from_tty, fprintf_filtered (file, _("Follow exec mode is \"%s\".\n"), value); } -/* EXECD_PATHNAME is assumed to be non-NULL. */ +/* EXEC_FILE_TARGET is assumed to be non-NULL. */ static void -follow_exec (ptid_t ptid, char *execd_pathname) +follow_exec (ptid_t ptid, char *exec_file_target) { struct thread_info *th, *tmp; struct inferior *inf = current_inferior (); int pid = ptid_get_pid (ptid); ptid_t process_ptid; + char *exec_file_host = NULL; + struct cleanup *old_chain; + struct gdb_exception prev_err = exception_none; /* This is an exec event that we actually wish to pay attention to. Refresh our symbol table to the newly exec'd program, remove any @@ -1155,7 +1158,7 @@ follow_exec (ptid_t ptid, char *execd_pathname) process_ptid = pid_to_ptid (pid); printf_unfiltered (_("%s is executing new program: %s\n"), target_pid_to_str (process_ptid), - execd_pathname); + exec_file_target); /* We've followed the inferior through an exec. Therefore, the inferior has essentially been killed & reborn. */ @@ -1164,14 +1167,18 @@ follow_exec (ptid_t ptid, char *execd_pathname) breakpoint_init_inferior (inf_execd); - if (*gdb_sysroot != '\0') - { - char *name = exec_file_find (execd_pathname, NULL); + exec_file_host = exec_file_find (exec_file_target, NULL); + old_chain = make_cleanup (xfree, exec_file_host); + make_cleanup (free_current_contents, &prev_err.message); - execd_pathname = (char *) alloca (strlen (name) + 1); - strcpy (execd_pathname, name); - xfree (name); - } + /* If we were unable to map the executable target pathname onto a host + pathname, tell the user that. Otherwise GDB's subsequent behavior + is confusing. Maybe it would even be better to stop at this point + so that the user can specify a file manually before continuing. */ + if (!exec_file_host) + warning (_("Could not load symbols for executable %s.\n" + "Do you need \"set sysroot\"?"), + exec_file_target); /* Reset the shared library package. This ensures that we get a shlib event when the child reaches "_start", at which point the @@ -1193,7 +1200,7 @@ follow_exec (ptid_t ptid, char *execd_pathname) inf = add_inferior_with_spaces (); inf->pid = pid; - target_follow_exec (inf, execd_pathname); + target_follow_exec (inf, exec_file_target); set_current_inferior (inf); set_current_program_space (inf->pspace); @@ -1212,22 +1219,62 @@ follow_exec (ptid_t ptid, char *execd_pathname) gdb_assert (current_program_space == inf->pspace); - /* That a.out is now the one to use. */ - exec_file_attach (execd_pathname, 0); + /* exec_file_attach and symbol_file_add_main may throw an error if the file + cannot be opened either locally or remotely. + + This happens for example, when the file is first found in the local + sysroot (above), and then disappears (a TOCTOU race), or when it doesn't + exist in the target filesystem, or when the file does exist, but + is not readable. + + Even without a symbol file, the remote-based debugging session should + continue normally instead of ending abruptly. Hence we catch thrown + errors/exceptions in the following code. */ + TRY + { + /* We must do this step even if exec_file_host is NULL, so that + exec_file_attach will clear state. */ + exec_file_attach (exec_file_host, 0); + } + CATCH (err, RETURN_MASK_ERROR) + { + if (err.message != NULL) + warning ("%s", err.message); + + prev_err = err; + + /* Save message so it doesn't get trashed by the catch below. */ + prev_err.message = xstrdup (err.message); + } + END_CATCH + + if (exec_file_host) + { + TRY + { + symbol_file_add (exec_file_host, + (inf->symfile_flags + | SYMFILE_MAINLINE | SYMFILE_DEFER_BP_RESET), + NULL, 0); + + if ((inf->symfile_flags & SYMFILE_NO_READ) == 0) + set_initial_language (); + } + CATCH (err, RETURN_MASK_ERROR) + { + if (!exception_print_same (prev_err, err)) + warning ("%s", err.message); + } + END_CATCH + } + + do_cleanups (old_chain); /* SYMFILE_DEFER_BP_RESET is used as the proper displacement for PIE (Position Independent Executable) main symbol file will get applied by solib_create_inferior_hook below. breakpoint_re_set would fail to insert the breakpoints with the zero displacement. */ - symbol_file_add (execd_pathname, - (inf->symfile_flags - | SYMFILE_MAINLINE | SYMFILE_DEFER_BP_RESET), - NULL, 0); - - if ((inf->symfile_flags & SYMFILE_NO_READ) == 0) - set_initial_language (); - /* If the target can specify a description, read it. Must do this after flipping to the new executable (because the target supplied description must be compatible with the executable's diff --git a/gdb/solib.c b/gdb/solib.c index b8c2b42..b84401b 100644 --- a/gdb/solib.c +++ b/gdb/solib.c @@ -388,13 +388,17 @@ solib_find_1 (char *in_pathname, int *fd, int is_solib) char * exec_file_find (char *in_pathname, int *fd) { - char *result = solib_find_1 (in_pathname, fd, 0); + char *result; + const char *fskind = effective_target_file_system_kind (); + + if (!in_pathname) + return NULL; - if (result == NULL) + if (*gdb_sysroot != '\0' && IS_TARGET_ABSOLUTE_PATH (fskind, in_pathname)) { - const char *fskind = effective_target_file_system_kind (); + result = solib_find_1 (in_pathname, fd, 0); - if (fskind == file_system_kind_dos_based) + if (result == NULL && fskind == file_system_kind_dos_based) { char *new_pathname; @@ -405,6 +409,21 @@ exec_file_find (char *in_pathname, int *fd) result = solib_find_1 (new_pathname, fd, 0); } } + else + { + /* It's possible we don't have a full path, but rather just a + filename. Some targets, such as HP-UX, don't provide the + full path, sigh. + + Attempt to qualify the filename against the source path. + (If that fails, we'll just fall back on the original + filename. Not much more we can do...) */ + + if (!source_full_path_of (in_pathname, &result)) + result = xstrdup (in_pathname); + if (fd != NULL) + *fd = -1; + } return result; } diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index c8709b7..117ddf1 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2016-10-21 Luis Machado + + * gdb.base/exec-invalid-sysroot.exp: New file. + 2016-10-20 Jan Kratochvil * lib/gdb.exp (get_compiler_info): Generalize gcc_compile regexp. diff --git a/gdb/testsuite/gdb.base/exec-invalid-sysroot.exp b/gdb/testsuite/gdb.base/exec-invalid-sysroot.exp new file mode 100644 index 0000000..5ab7a20 --- /dev/null +++ b/gdb/testsuite/gdb.base/exec-invalid-sysroot.exp @@ -0,0 +1,84 @@ +# Copyright 1997-2016 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# This test exercises PR20569. GDB crashes when attempting to follow +# an exec call when it cannot resolve the path to the symbol file. +# This is the case when an invalid sysroot is provided. + +# Until "catch exec" is implemented on other targets... +# +if { ![istarget "*-linux*"] } then { + continue +} + +standard_testfile foll-exec.c + +global binfile +set binfile [standard_output_file "foll-exec"] +set testfile2 "execd-prog" +set srcfile2 ${testfile2}.c +set binfile2 [standard_output_file ${testfile2}] + +set GDBFLAGS "${GDBFLAGS} -ex \"set sysroot /a/path/that/does/not/exist\"" + +set compile_options debug + +# build the first test case +if { [gdb_compile "${srcdir}/${subdir}/${srcfile2}" "${binfile2}" executable $compile_options] != "" } { + untested foll-exec.exp + return -1 +} + +if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable $compile_options] != "" } { + untested foll-exec.exp + return -1 +} + +proc do_exec_tests {} { + global binfile srcfile srcfile2 testfile testfile2 + global gdb_prompt + + # Start the program running, and stop at main. + # + if ![runto_main] then { + fail "Couldn't run ${testfile}" + return + } + + # Verify that the system supports "catch exec". + gdb_test "catch exec" "Catchpoint \[0-9\]* \\(exec\\)" "insert first exec catchpoint" + set has_exec_catchpoints 0 + gdb_test_multiple "continue" "continue to first exec catchpoint" { + -re ".*Your system does not support this type\r\nof catchpoint.*$gdb_prompt $" { + unsupported "continue to first exec catchpoint" + return + } + -re ".*Catchpoint.*$gdb_prompt $" { + set has_exec_catchpoints 1 + pass "continue to first exec catchpoint" + } + default { + # This catches the case where GDB crashes. + fail "continue to first exec catchpoint" + } + } +} + +# Start with a fresh gdb +gdb_exit +clean_restart $binfile +do_exec_tests + +return 0