[SCM] jankratochvil/gdbserverbuildid: Merge branch 'common-mergehex-empty-moveprep-move-attrgen-validate' into common-mergehex-empty-moveprep-move-attrgen-validate-tests

[jkratoch@sourceware.org]

The branch, jankratochvil/gdbserverbuildid has been updated
       via  9bfc8cc7f83e8e4bfbe049b1b1a7872662253e8b (commit)
       via  066b19e79da634dd488e084a6d41cdb3463fdbbb (commit)
       via  5fd148de332aa1a61f7941a1f944facf6bdd2ceb (commit)
       via  8e6d4ab38a6c4f809470ce78168c49c82ef69948 (commit)
       via  fb9f93fc9db956497a21461355d84d1f2d4ae2fd (commit)
       via  6d8951d7d1cc8719d70218684e7ac1f805df5e49 (commit)
       via  b3ce684b0c5d3e0b7bf2250ad7ada427d4e7bdd0 (commit)
       via  3568f863a43cdf5c4192466863ac1373c4dede4b (commit)
       via  c91550fc5d8dae5f1140bca649690fa13e5276e9 (commit)
      from  25f74e017f132f23bb1739cd6d138b241aeda267 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email.

- Log -----------------------------------------------------------------
commit 9bfc8cc7f83e8e4bfbe049b1b1a7872662253e8b
Merge: 25f74e0 066b19e
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Thu Feb 27 21:19:30 2014 +0100

    Merge branch 'common-mergehex-empty-moveprep-move-attrgen-validate' into common-mergehex-empty-moveprep-move-attrgen-validate-tests

commit 066b19e79da634dd488e084a6d41cdb3463fdbbb
Merge: 0ab7e2d 5fd148d
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Thu Feb 27 21:19:29 2014 +0100

    Merge branch 'common-mergehex-empty-moveprep-move-attrgen' into common-mergehex-empty-moveprep-move-attrgen-validate

commit 5fd148de332aa1a61f7941a1f944facf6bdd2ceb
Merge: c27b897 8e6d4ab
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Thu Feb 27 21:19:28 2014 +0100

    Merge branch 'common-mergehex-empty-moveprep-move' into common-mergehex-empty-moveprep-move-attrgen

commit 8e6d4ab38a6c4f809470ce78168c49c82ef69948
Merge: 6dc0e59 fb9f93f
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Thu Feb 27 21:19:27 2014 +0100

    Merge branch 'common-mergehex-empty-moveprep' into common-mergehex-empty-moveprep-move

commit fb9f93fc9db956497a21461355d84d1f2d4ae2fd
Merge: b0c663b 6d8951d
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Thu Feb 27 21:19:27 2014 +0100

    Merge branch 'common-mergehex-empty' into common-mergehex-empty-moveprep

commit 6d8951d7d1cc8719d70218684e7ac1f805df5e49
Merge: d767a00 b3ce684
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Thu Feb 27 21:19:26 2014 +0100

    Merge branch 'common-mergehex' into common-mergehex-empty

commit b3ce684b0c5d3e0b7bf2250ad7ada427d4e7bdd0
Merge: 335e60d 3568f86
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Thu Feb 27 21:19:23 2014 +0100

    Merge branch 'common' into common-mergehex

commit 3568f863a43cdf5c4192466863ac1373c4dede4b
Merge: 01c4ebe c91550f
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Thu Feb 27 21:19:23 2014 +0100

    Merge remote-tracking branch 'gdb/master' into common

commit c91550fc5d8dae5f1140bca649690fa13e5276e9
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Thu Feb 27 21:16:04 2014 +0100

    Additional PR 8882 fix.
    
    runtest gdb.base/corefile.exp
    
    ==23174== ERROR: AddressSanitizer: heap-use-after-free on address 0x604400008c88 at pc 0x68f0be bp 0x7fffae9d7490 sp
    0x7fffae9d7480
    READ of size 8 at 0x604400008c88 thread T0
        #0 0x68f0bd in svr4_read_so_list (/home/jkratoch/redhat/gdb-clean/gdb/gdb+0x68f0bd)
        #1 0x68f64e in svr4_current_sos_direct (/home/jkratoch/redhat/gdb-clean/gdb/gdb+0x68f64e)
        #2 0x68f757 in svr4_current_sos (/home/jkratoch/redhat/gdb-clean/gdb/gdb+0x68f757)
        #3 0xcebbff in update_solib_list (/home/jkratoch/redhat/gdb-clean/gdb/gdb+0xcebbff)
    0x604400008c88 is located 8 bytes inside of 1104-byte region [0x604400008c80,0x6044000090d0)
    freed by thread T0 here:
        #0 0x7f52677500f9 (/lib64/libasan.so.0+0x160f9)
        #1 0xd2c68a in xfree (/home/jkratoch/redhat/gdb-clean/gdb/gdb+0xd2c68a)
        #2 0xceb364 in free_so (/home/jkratoch/redhat/gdb-clean/gdb/gdb+0xceb364)
        #3 0xca59f8 in do_free_so (/home/jkratoch/redhat/gdb-clean/gdb/gdb+0xca59f8)
        #4 0x93432a in do_my_cleanups (/home/jkratoch/redhat/gdb-clean/gdb/gdb+0x93432a)
        #5 0x934406 in do_cleanups (/home/jkratoch/redhat/gdb-clean/gdb/gdb+0x934406)
        #6 0x68efa9 in svr4_read_so_list (/home/jkratoch/redhat/gdb-clean/gdb/gdb+0x68efa9)
    
    I did not notice it during my review in:
    	Re: [PATCH v2] Skip vDSO when reading SO list (PR 8882)
    	https://sourceware.org/ml/gdb-patches/2013-09/msg00888.html
    
    gdb/
    2014-02-27  Jan Kratochvil  <jan.kratochvil@redhat.com>
    
    	Additional PR 8882 fix.
    	* solib-svr4.c (svr4_read_so_list): Change first to first_l_name.
    
    Message-ID: <20140226220918.GA10431@host2.jankratochvil.net>

-----------------------------------------------------------------------

Summary of changes:
 gdb/ChangeLog    |    5 +++++
 gdb/solib-svr4.c |    7 +++----
 2 files changed, 8 insertions(+), 4 deletions(-)

First 500 lines of diff:
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 6cfb9c5..5dadb4f 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2014-02-27  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	Additional PR 8882 fix.
+	* solib-svr4.c (svr4_read_so_list): Change first to first_l_name.
+
 2014-02-27  Pedro Alves  <palves@redhat.com>
 
 	* nat/linux-waitpid.c (my_waitpid): Only block signals if WNOHANG
diff --git a/gdb/solib-svr4.c b/gdb/solib-svr4.c
index 45fcb99..7d4cce9 100644
--- a/gdb/solib-svr4.c
+++ b/gdb/solib-svr4.c
@@ -1359,7 +1359,7 @@ static int
 svr4_read_so_list (CORE_ADDR lm, CORE_ADDR prev_lm,
 		   struct so_list ***link_ptr_ptr, int ignore_first)
 {
-  struct so_list *first = NULL;
+  CORE_ADDR first_l_name;
   CORE_ADDR next_lm;
 
   for (; lm != 0; prev_lm = lm, lm = next_lm)
@@ -1399,7 +1399,7 @@ svr4_read_so_list (CORE_ADDR lm, CORE_ADDR prev_lm,
 	{
 	  struct svr4_info *info = get_svr4_info ();
 
-	  first = new;
+	  first_l_name = new->lm_info->l_name;
 	  info->main_lm_addr = new->lm_info->lm_addr;
 	  do_cleanups (old_chain);
 	  continue;
@@ -1414,8 +1414,7 @@ svr4_read_so_list (CORE_ADDR lm, CORE_ADDR prev_lm,
 	     inferior executable, then this is not a normal shared
 	     object, but (most likely) a vDSO.  In this case, silently
 	     skip it; otherwise emit a warning. */
-	  if (first == NULL
-	      || new->lm_info->l_name != first->lm_info->l_name)
+	  if (first_l_name == 0 || new->lm_info->l_name != first_l_name)
 	    warning (_("Can't read pathname for load map: %s."),
 		     safe_strerror (errcode));
 	  do_cleanups (old_chain);


hooks/post-receive
--
Repository for Project Archer.