* [gentoo-commits] gentoo commit in src/patchsets/gdb/7.0.1: 05_all_readline-headers.patch 20_all_gdb-tdep-opcode-include-workaround.patch 35_all_gdb-6.3-security-errata-20050610.patch 80_all_gdb-6.5-dwarf-stack-overflow.patch README.history
@ 2010-03-19 1:45 Mike Frysinger (vapier)
0 siblings, 0 replies; only message in thread
From: Mike Frysinger (vapier) @ 2010-03-19 1:45 UTC (permalink / raw
To: gentoo-commits
vapier 10/03/19 01:45:44
Added: 05_all_readline-headers.patch
20_all_gdb-tdep-opcode-include-workaround.patch
35_all_gdb-6.3-security-errata-20050610.patch
80_all_gdb-6.5-dwarf-stack-overflow.patch
README.history
Log:
initial 7.0.1 patchset based on last 7.0 patchset
Revision Changes Path
1.1 src/patchsets/gdb/7.0.1/05_all_readline-headers.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gdb/7.0.1/05_all_readline-headers.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gdb/7.0.1/05_all_readline-headers.patch?rev=1.1&content-type=text/plain
Index: 05_all_readline-headers.patch
===================================================================
--- a/readline/complete.c
+++ b/readline/complete.c
@@ -25,6 +25,11 @@
# include <config.h>
#endif
+#ifdef HAVE_WCHAR_H /* wcwidth() */
+# define _GNU_SOURCE
+# include <wchar.h>
+#endif
+
#include <sys/types.h>
#include <fcntl.h>
#if defined (HAVE_SYS_FILE_H)
--- a/readline/display.c
+++ b/readline/display.c
@@ -25,6 +25,11 @@
# include <config.h>
#endif
+#ifdef HAVE_WCHAR_H /* wcwidth() */
+# define _GNU_SOURCE
+# include <wchar.h>
+#endif
+
#include <sys/types.h>
#if defined (HAVE_UNISTD_H)
--- a/readline/mbutil.c
+++ b/readline/mbutil.c
@@ -25,6 +25,11 @@
# include <config.h>
#endif
+#ifdef HAVE_WCHAR_H /* wcwidth() */
+# define _GNU_SOURCE
+# include <wchar.h>
+#endif
+
#include <sys/types.h>
#include <fcntl.h>
#include "posixjmp.h"
1.1 src/patchsets/gdb/7.0.1/20_all_gdb-tdep-opcode-include-workaround.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gdb/7.0.1/20_all_gdb-tdep-opcode-include-workaround.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gdb/7.0.1/20_all_gdb-tdep-opcode-include-workaround.patch?rev=1.1&content-type=text/plain
Index: 20_all_gdb-tdep-opcode-include-workaround.patch
===================================================================
workaround build failure
http://bugs.gentoo.org/216368
http://bugs.gentoo.org/299600
--- a/gdb/frv-tdep.c
+++ b/gdb/frv-tdep.c
@@ -32,7 +32,7 @@
#include "gdb_assert.h"
#include "sim-regno.h"
#include "gdb/sim-frv.h"
-#include "opcodes/frv-desc.h" /* for the H_SPR_... enums */
+#include "../opcodes/frv-desc.h" /* for the H_SPR_... enums */
#include "symtab.h"
#include "elf-bfd.h"
#include "elf/frv.h"
--- a/gdb/mep-tdep.c
+++ b/gdb/mep-tdep.c
@@ -53,8 +53,8 @@
/* Get the user's customized MeP coprocessor register names from
libopcodes. */
-#include "opcodes/mep-desc.h"
-#include "opcodes/mep-opc.h"
+#include "../opcodes/mep-desc.h"
+#include "../opcodes/mep-opc.h"
\f
/* The gdbarch_tdep structure. */
--- a/gdb/lm32-tdep.c
+++ b/gdb/lm32-tdep.c
@@ -35,7 +35,7 @@
#include "regcache.h"
#include "trad-frame.h"
#include "reggroups.h"
-#include "opcodes/lm32-desc.h"
+#include "../opcodes/lm32-desc.h"
#include "gdb_string.h"
1.1 src/patchsets/gdb/7.0.1/35_all_gdb-6.3-security-errata-20050610.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gdb/7.0.1/35_all_gdb-6.3-security-errata-20050610.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gdb/7.0.1/35_all_gdb-6.3-security-errata-20050610.patch?rev=1.1&content-type=text/plain
Index: 35_all_gdb-6.3-security-errata-20050610.patch
===================================================================
http://sourceware.org/ml/gdb-patches/2005-05/threads.html#00637
Proposed upstream but never committed upstream.
2005-06-09 Jeff Johnston <jjohnstn@redhat.com>
* gdb.base/gdbinit.exp: New testcase.
* gdb.base/gdbinit.sample: Sample .gdbinit for gdbinit.exp.
2005-06-08 Daniel Jacobowitz <dan@codesourcery.com>
Jeff Johnston <jjohnstn@redhat.com>
* Makefile.in (cli-cmds.o): Update.
* configure.in: Add check for getuid.
* configure: Regenerated.
* config.in: Ditto.
* main.c (captured_main): Pass -1 to source_command when loading
gdbinit files.
* cli/cli-cmds.c: Include "gdb_stat.h" and <fcntl.h>.
(source_command): Update documentation. Check permissions if
FROM_TTY is -1.
Index: gdb-6.8.50.20090226/gdb/cli/cli-cmds.c
===================================================================
--- gdb-6.8.50.20090226.orig/gdb/cli/cli-cmds.c 2009-02-27 00:04:32.000000000 +0100
+++ gdb-6.8.50.20090226/gdb/cli/cli-cmds.c 2009-02-28 07:17:49.000000000 +0100
@@ -36,6 +36,7 @@
#include "objfiles.h"
#include "source.h"
#include "disasm.h"
+#include "gdb_stat.h"
#include "ui-out.h"
@@ -466,7 +467,7 @@ source_script (char *file, int from_tty)
if (fd == -1)
{
- if (from_tty)
+ if (from_tty > 0)
perror_with_name (file);
else
{
@@ -475,6 +476,29 @@ source_script (char *file, int from_tty)
}
}
+#ifdef HAVE_GETUID
+ if (from_tty == -1)
+ {
+ struct stat statbuf;
+
+ if (fstat (fd, &statbuf) < 0)
+ {
+ close (fd);
+ /* Do not do_cleanups (old_cleanups) as FILE is allocated there.
+ perror_with_name calls error which should call the cleanups. */
+ perror_with_name (file);
+ }
+ if (statbuf.st_uid != getuid () || (statbuf.st_mode & S_IWOTH))
+ {
+ /* FILE gets freed by do_cleanups (old_cleanups). */
+ warning (_("not using untrusted file \"%s\""), file);
+ close (fd);
+ do_cleanups (old_cleanups);
+ return;
+ }
+ }
+#endif
+
stream = fdopen (fd, FOPEN_RT);
script_from_file (stream, file);
@@ -486,6 +510,7 @@ source_script (char *file, int from_tty)
else
script_from_file (stream, file);
+ /* FILE gets freed by do_cleanups (old_cleanups). */
do_cleanups (old_cleanups);
}
Index: gdb-6.8.50.20090226/gdb/testsuite/gdb.base/gdbinit.exp
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ gdb-6.8.50.20090226/gdb/testsuite/gdb.base/gdbinit.exp 2009-02-28 07:15:57.000000000 +0100
@@ -0,0 +1,98 @@
+# Copyright 2005
+# 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 2 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, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+# Please email any bugs, comments, and/or additions to this file to:
+# bug-gdb@prep.ai.mit.edu
+
+# This file was written by Jeff Johnston <jjohnstn@redhat.com>.
+
+if $tracelevel then {
+ strace $tracelevel
+}
+
+set prms_id 0
+set bug_id 0
+
+# are we on a target board
+if [is_remote target] {
+ return
+}
+
+
+global verbose
+global GDB
+global GDBFLAGS
+global gdb_prompt
+global timeout
+global gdb_spawn_id;
+
+gdb_stop_suppressing_tests;
+
+verbose "Spawning $GDB -nw"
+
+if [info exists gdb_spawn_id] {
+ return 0;
+}
+
+if ![is_remote host] {
+ if { [which $GDB] == 0 } then {
+ perror "$GDB does not exist."
+ exit 1
+ }
+}
+
+set env(HOME) [pwd]
+remote_exec build "rm .gdbinit"
+remote_exec build "cp ${srcdir}/${subdir}/gdbinit.sample .gdbinit"
+remote_exec build "chmod 646 .gdbinit"
+
+set res [remote_spawn host "$GDB -nw [host_info gdb_opts]"];
+if { $res < 0 || $res == "" } {
+ perror "Spawning $GDB failed."
+ return 1;
+}
+gdb_expect 360 {
+ -re "warning: not using untrusted file.*\.gdbinit.*\[\r\n\]$gdb_prompt $" {
+ pass "untrusted .gdbinit caught."
+ }
+ -re "$gdb_prompt $" {
+ fail "untrusted .gdbinit caught."
+ }
+ timeout {
+ fail "(timeout) untrusted .gdbinit caught."
+ }
+}
+
+remote_exec build "chmod 644 .gdbinit"
+set res [remote_spawn host "$GDB -nw [host_info gdb_opts]"];
+if { $res < 0 || $res == "" } {
+ perror "Spawning $GDB failed."
+ return 1;
+}
+gdb_expect 360 {
+ -re "warning: not using untrusted file.*\.gdbinit.*\[\r\n\]$gdb_prompt $" {
+ fail "trusted .gdbinit allowed."
+ }
+ -re "in gdbinit.*$gdb_prompt $" {
+ pass "trusted .gdbinit allowed."
+ }
+ timeout {
+ fail "(timeout) trusted .gdbinit allowed."
+ }
+}
+
+remote_exec build "rm .gdbinit"
Index: gdb-6.8.50.20090226/gdb/testsuite/gdb.base/gdbinit.sample
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ gdb-6.8.50.20090226/gdb/testsuite/gdb.base/gdbinit.sample 2009-02-28 07:15:57.000000000 +0100
@@ -0,0 +1 @@
+echo "\nin gdbinit"
Index: gdb-6.8.50.20090226/gdb/main.c
===================================================================
--- gdb-6.8.50.20090226.orig/gdb/main.c 2009-02-27 00:04:32.000000000 +0100
+++ gdb-6.8.50.20090226/gdb/main.c 2009-02-28 07:15:57.000000000 +0100
@@ -855,7 +855,7 @@ Excess command line arguments ignored. (
debugging or what directory you are in. */
if (home_gdbinit && !inhibit_gdbinit)
- catch_command_errors (source_script, home_gdbinit, 0, RETURN_MASK_ALL);
+ catch_command_errors (source_script, home_gdbinit, -1, RETURN_MASK_ALL);
/* Now perform all the actions indicated by the arguments. */
if (cdarg != NULL)
@@ -924,7 +924,7 @@ Can't attach to process and specify a co
/* Read the .gdbinit file in the current directory, *if* it isn't
the same as the $HOME/.gdbinit file (it should exist, also). */
if (local_gdbinit && !inhibit_gdbinit)
- catch_command_errors (source_script, local_gdbinit, 0, RETURN_MASK_ALL);
+ catch_command_errors (source_script, local_gdbinit, -1, RETURN_MASK_ALL);
for (i = 0; i < ncmd; i++)
{
1.1 src/patchsets/gdb/7.0.1/80_all_gdb-6.5-dwarf-stack-overflow.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gdb/7.0.1/80_all_gdb-6.5-dwarf-stack-overflow.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gdb/7.0.1/80_all_gdb-6.5-dwarf-stack-overflow.patch?rev=1.1&content-type=text/plain
Index: 80_all_gdb-6.5-dwarf-stack-overflow.patch
===================================================================
http://bugs.gentoo.org/144833
for gdb/ChangeLog:
2006-08-22 Will Drewry <wad@google.com>
Tavis Ormandy <taviso@google.com>
* dwarf2read.c (decode_locdesc): Enforce location description stack
boundaries.
* dwarfread.c (locval): Likewise.
2007-10-15 Jan Kratochvil <jan.kratochvil@redhat.com>
Port to GDB-6.7.
Index: gdb-6.7/gdb/dwarf2read.c
===================================================================
--- gdb-6.7.orig/gdb/dwarf2read.c 2007-10-15 00:08:30.000000000 +0200
+++ gdb-6.7/gdb/dwarf2read.c 2007-10-15 21:42:43.000000000 +0200
@@ -9070,8 +9070,7 @@ dwarf2_fundamental_type (struct objfile
callers will only want a very basic result and this can become a
complaint.
- Note that stack[0] is unused except as a default error return.
- Note that stack overflow is not yet handled. */
+ Note that stack[0] is unused except as a default error return. */
static CORE_ADDR
decode_locdesc (struct dwarf_block *blk, struct dwarf2_cu *cu)
@@ -9088,7 +9087,7 @@ decode_locdesc (struct dwarf_block *blk,
i = 0;
stacki = 0;
- stack[stacki] = 0;
+ stack[++stacki] = 0;
while (i < size)
{
@@ -9270,6 +9269,16 @@ decode_locdesc (struct dwarf_block *blk,
dwarf_stack_op_name (op));
return (stack[stacki]);
}
+ /* Enforce maximum stack depth of size-1 to avoid ++stacki writing
+ outside of the allocated space. Also enforce minimum > 0.
+ -- wad@google.com 14 Aug 2006 */
+ if (stacki >= sizeof (stack) / sizeof (*stack) - 1)
+ internal_error (__FILE__, __LINE__,
+ _("location description stack too deep: %d"),
+ stacki);
+ if (stacki <= 0)
+ internal_error (__FILE__, __LINE__,
+ _("location description stack too shallow"));
}
return (stack[stacki]);
}
1.1 src/patchsets/gdb/7.0.1/README.history
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gdb/7.0.1/README.history?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gdb/7.0.1/README.history?rev=1.1&content-type=text/plain
Index: README.history
===================================================================
1 04.01.2009
+ 05_all_readline-headers.patch
+ 20_all_gdb-tdep-opcode-include-workaround.patch
+ 35_all_gdb-6.3-security-errata-20050610.patch
+ 80_all_gdb-6.5-dwarf-stack-overflow.patch
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2010-03-19 1:45 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-03-19 1:45 [gentoo-commits] gentoo commit in src/patchsets/gdb/7.0.1: 05_all_readline-headers.patch 20_all_gdb-tdep-opcode-include-workaround.patch 35_all_gdb-6.3-security-errata-20050610.patch 80_all_gdb-6.5-dwarf-stack-overflow.patch README.history Mike Frysinger (vapier)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox