Guinevere Larsen
parent
0777f350e2
commit
e5a8be3bb0
|
|
@ -479,3 +479,7 @@ Patch115: gdb-rhbz-2130624-assert_in_jit_event_handler.patch
|
|||
# (Luís Ferreira, RHBZ2132600)
|
||||
Patch116: libiberty-rhbz-2132600-prevent-buffer-overflow.patch
|
||||
|
||||
# Backport: Fix crash in Fortran code
|
||||
# (Tom Tromey, RHEL-7328)
|
||||
Patch117: gdb-rhel-7328-fix-fortran-28801.patch
|
||||
|
||||
|
|
|
|||
|
|
@ -114,3 +114,4 @@
|
|||
%patch114 -p1
|
||||
%patch115 -p1
|
||||
%patch116 -p1
|
||||
%patch117 -p1
|
||||
|
|
|
|||
|
|
@ -114,3 +114,4 @@ gdb-rhbz2155439-assert-failure-copy_type.patch
|
|||
gdb-fix-gdb.base-printcmds-s390x-regressions.patch
|
||||
gdb-rhbz-2130624-assert_in_jit_event_handler.patch
|
||||
libiberty-rhbz-2132600-prevent-buffer-overflow.patch
|
||||
gdb-rhel-7328-fix-fortran-28801.patch
|
||||
|
|
|
|||
|
|
@ -0,0 +1,259 @@
|
|||
From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
|
||||
From: Tom Tromey <tom@tromey.com>
|
||||
Date: Thu, 24 Feb 2022 09:01:42 -0700
|
||||
Subject: gdb-rhel-7328-fix-fortran-28801.patch
|
||||
|
||||
;; Backport: Fix crash in Fortran code
|
||||
;; (Tom Tromey, RHEL-7328)
|
||||
|
||||
PR fortran/28801 points out a gdb crash that can be provoked by
|
||||
certain Fortran code. The bug is that f77_get_upperbound assumes the
|
||||
property is either a constant or undefined, but in this case it is
|
||||
PROP_LOCEXPR.
|
||||
|
||||
This patch fixes the crash by making this function (and the
|
||||
lower-bound one as well) do the correct check before calling
|
||||
'const_val'.
|
||||
|
||||
Thanks to Andrew for writing the test case.
|
||||
|
||||
Co-authored-by: Andrew Burgess <aburgess@redhat.com>
|
||||
Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=28801
|
||||
|
||||
diff --git a/gdb/f-valprint.c b/gdb/f-valprint.c
|
||||
--- a/gdb/f-valprint.c
|
||||
+++ b/gdb/f-valprint.c
|
||||
@@ -47,7 +47,7 @@ int f77_array_offset_tbl[MAX_FORTRAN_DIMS + 1][2];
|
||||
LONGEST
|
||||
f77_get_lowerbound (struct type *type)
|
||||
{
|
||||
- if (type->bounds ()->low.kind () == PROP_UNDEFINED)
|
||||
+ if (type->bounds ()->low.kind () != PROP_CONST)
|
||||
error (_("Lower bound may not be '*' in F77"));
|
||||
|
||||
return type->bounds ()->low.const_val ();
|
||||
@@ -56,7 +56,7 @@ f77_get_lowerbound (struct type *type)
|
||||
LONGEST
|
||||
f77_get_upperbound (struct type *type)
|
||||
{
|
||||
- if (type->bounds ()->high.kind () == PROP_UNDEFINED)
|
||||
+ if (type->bounds ()->high.kind () != PROP_CONST)
|
||||
{
|
||||
/* We have an assumed size array on our hands. Assume that
|
||||
upper_bound == lower_bound so that we show at least 1 element.
|
||||
diff --git a/gdb/testsuite/gdb.dwarf2/fortran-var-string.c b/gdb/testsuite/gdb.dwarf2/fortran-var-string.c
|
||||
new file mode 100644
|
||||
--- /dev/null
|
||||
+++ b/gdb/testsuite/gdb.dwarf2/fortran-var-string.c
|
||||
@@ -0,0 +1,31 @@
|
||||
+/* Copyright 2022 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 <http://www.gnu.org/licenses/>. */
|
||||
+
|
||||
+/* In the generated DWARF, we'll pretend that ARG is a string with dynamic
|
||||
+ length. */
|
||||
+int
|
||||
+main_helper (void *arg)
|
||||
+{
|
||||
+ asm ("main_helper_label: .globl main_helper_label");
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+int
|
||||
+main (void)
|
||||
+{
|
||||
+ asm ("main_label: .globl main_label");
|
||||
+ main_helper (0);
|
||||
+ return 0;
|
||||
+}
|
||||
diff --git a/gdb/testsuite/gdb.dwarf2/fortran-var-string.exp b/gdb/testsuite/gdb.dwarf2/fortran-var-string.exp
|
||||
new file mode 100644
|
||||
--- /dev/null
|
||||
+++ b/gdb/testsuite/gdb.dwarf2/fortran-var-string.exp
|
||||
@@ -0,0 +1,175 @@
|
||||
+# Copyright 2022 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 <http://www.gnu.org/licenses/>.
|
||||
+load_lib dwarf.exp
|
||||
+
|
||||
+# This test can only be run on targets which support DWARF-2 and use gas.
|
||||
+if {![dwarf2_support]} {
|
||||
+ return 0
|
||||
+}
|
||||
+
|
||||
+standard_testfile .c -dw.S
|
||||
+
|
||||
+# We need to know the size of integer and address types in order
|
||||
+# to write some of the debugging info we'd like to generate.
|
||||
+#
|
||||
+# For that, we ask GDB by debugging our dynarr-ptr.c program.
|
||||
+# Any program would do, but since we already have dynarr-ptr.c
|
||||
+# specifically for this testcase, might as well use that.
|
||||
+
|
||||
+if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
|
||||
+ return -1
|
||||
+}
|
||||
+
|
||||
+# Make some DWARF for the test.
|
||||
+set asm_file [standard_output_file $srcfile2]
|
||||
+Dwarf::assemble $asm_file {
|
||||
+ set int_size [get_sizeof "int" 4]
|
||||
+
|
||||
+ get_func_info main
|
||||
+ get_func_info main_helper
|
||||
+
|
||||
+ cu {} {
|
||||
+ DW_TAG_compile_unit {
|
||||
+ {DW_AT_language @DW_LANG_Fortran90}
|
||||
+ {DW_AT_name fortran-var-string.f90}
|
||||
+ {DW_AT_comp_dir /tmp}
|
||||
+ } {
|
||||
+ declare_labels integer_label string_label array_lb_label \
|
||||
+ array_ub_label
|
||||
+
|
||||
+ DW_TAG_subprogram {
|
||||
+ {name main}
|
||||
+ {low_pc $main_helper_start addr}
|
||||
+ {high_pc $main_helper_len data8}
|
||||
+ {DW_AT_type :$integer_label}
|
||||
+ {DW_AT_decl_file 1 data1}
|
||||
+ {DW_AT_decl_line 1 data1}
|
||||
+ }
|
||||
+
|
||||
+ DW_TAG_subprogram {
|
||||
+ {name test_1_func}
|
||||
+ {low_pc $main_start addr}
|
||||
+ {high_pc $main_len data8}
|
||||
+ {DW_AT_type :$integer_label}
|
||||
+ {DW_AT_decl_file 1 data1}
|
||||
+ {DW_AT_decl_line 2 data1}
|
||||
+ } {
|
||||
+ formal_parameter {
|
||||
+ {name arg1}
|
||||
+ {type :$string_label}
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ DW_TAG_subprogram {
|
||||
+ {name test_2_func}
|
||||
+ {low_pc $main_start addr}
|
||||
+ {high_pc $main_len data8}
|
||||
+ {DW_AT_type :$integer_label}
|
||||
+ {DW_AT_decl_file 1 data1}
|
||||
+ {DW_AT_decl_line 3 data1}
|
||||
+ } {
|
||||
+ formal_parameter {
|
||||
+ {name arg1}
|
||||
+ {type :$array_ub_label}
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ DW_TAG_subprogram {
|
||||
+ {name test_3_func}
|
||||
+ {low_pc $main_start addr}
|
||||
+ {high_pc $main_len data8}
|
||||
+ {DW_AT_type :$integer_label}
|
||||
+ {DW_AT_decl_file 1 data1}
|
||||
+ {DW_AT_decl_line 4 data1}
|
||||
+ } {
|
||||
+ formal_parameter {
|
||||
+ {name arg1}
|
||||
+ {type :$array_lb_label}
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ integer_label: DW_TAG_base_type {
|
||||
+ {DW_AT_byte_size $int_size DW_FORM_sdata}
|
||||
+ {DW_AT_encoding @DW_ATE_signed}
|
||||
+ {DW_AT_name integer}
|
||||
+ }
|
||||
+
|
||||
+ string_label: DW_TAG_string_type {
|
||||
+ {DW_AT_byte_size $int_size DW_FORM_sdata}
|
||||
+ {DW_AT_name .str.arg}
|
||||
+ {DW_AT_string_length {} DW_FORM_block1}
|
||||
+ }
|
||||
+
|
||||
+ array_lb_label: DW_TAG_array_type {
|
||||
+ {DW_AT_ordering 1 data1}
|
||||
+ {DW_AT_type :$integer_label}
|
||||
+ } {
|
||||
+ DW_TAG_subrange_type {
|
||||
+ {DW_AT_lower_bound {} DW_FORM_block1}
|
||||
+ {DW_AT_upper_bound 10 DW_FORM_data1}
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ array_ub_label: DW_TAG_array_type {
|
||||
+ {DW_AT_ordering 1 data1}
|
||||
+ {DW_AT_type :$integer_label}
|
||||
+ } {
|
||||
+ DW_TAG_subrange_type {
|
||||
+ {DW_AT_upper_bound {} DW_FORM_block1}
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+# Now that we've generated the DWARF debugging info, rebuild our
|
||||
+# program using our debug info instead of the info generated by
|
||||
+# the compiler.
|
||||
+
|
||||
+if { [prepare_for_testing "failed to prepare" ${testfile} \
|
||||
+ [list $srcfile $asm_file] {nodebug}] } {
|
||||
+ return -1
|
||||
+}
|
||||
+
|
||||
+if ![runto_main] {
|
||||
+ return -1
|
||||
+}
|
||||
+
|
||||
+gdb_test_no_output "set language fortran"
|
||||
+
|
||||
+gdb_test "info functions test_1_func" \
|
||||
+ "2:\\s+integer test_1_func\\(character\\*\\(\\*\\)\\);"
|
||||
+
|
||||
+# We print `1` here as the bound because GDB treats this as an assumed
|
||||
+# size array, and just reports the lower bound value for the upper
|
||||
+# bound.
|
||||
+#
|
||||
+# We might, in the future, decide that there's a better way we could
|
||||
+# tell the user about the type of this array argument, when that
|
||||
+# happens it's OK to change the expected results here.
|
||||
+gdb_test "info functions test_2_func" \
|
||||
+ "3:\\s+integer test_2_func\\(integer \\(1\\)\\);"
|
||||
+
|
||||
+# It's not completely clear that this error is correct here. Why
|
||||
+# can't the lower bound be a dynamic expression?
|
||||
+#
|
||||
+# This test was initially added to guard against the case where GDB
|
||||
+# was crashing if/when it saw this situation.
|
||||
+#
|
||||
+# If later on, GDB's handling of array types with a dynamic loewr
|
||||
+# bound changes, then it is possible that the expected result here
|
||||
+# should change.
|
||||
+gdb_test "info functions test_3_func" \
|
||||
+ "4:\\s+Lower bound may not be '\\*' in F77"
|
||||
6
gdb.spec
6
gdb.spec
|
|
@ -37,7 +37,7 @@ Version: 10.2
|
|||
|
||||
# The release always contains a leading reserved number, start it at 1.
|
||||
# `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing.
|
||||
Release: 11%{?dist}
|
||||
Release: 12%{?dist}
|
||||
|
||||
License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ and GPLv2+ with exceptions and GPL+ and LGPLv2+ and LGPLv3+ and BSD and Public Domain and GFDL
|
||||
# Do not provide URL for snapshots as the file lasts there only for 2 days.
|
||||
|
|
@ -1158,6 +1158,10 @@ fi
|
|||
%endif
|
||||
|
||||
%changelog
|
||||
* Tue Oct 3 2023 Guinevere Larsen <blarsen@redhat.com> - 10.2-12.el9
|
||||
- Backport "Fix crash in Fortran code"
|
||||
(Tom Tromey, RHEL-7328)
|
||||
|
||||
* Wed Mar 29 2023 Bruno Larsen <blarsen@redhat.com> - 10.2-11.el9
|
||||
- Backport "libiberty: prevent buffer overflow when decoding user input"
|
||||
(Luís Ferreira, RHBZ2132600)
|
||||
|
|
|
|||
Loading…
Reference in New Issue