From: Alan Modra <amodra@gmail.com>
To: binutils@sourceware.org
Subject: [PATCH 4/4] Don't pass around expld.dataseg pointer
Date: Tue, 8 Feb 2022 11:38:33 +1030 [thread overview]
Message-ID: <20220208010833.2103874-5-amodra@gmail.com> (raw)
In-Reply-To: <20220208010833.2103874-1-amodra@gmail.com>
The better to see any code that accesses expld.dataseg.
* ldexp.c (fold_segment_end): Remove seg parameter. Adjust calls.
(fold_segment_align, fold_segment_relro_end): Likewise.
* ldlang.c (lang_size_segment): Likewise.
(lang_size_relro_segment_1, lang_find_relro_sections_1): Likewise.
diff --git a/ld/ldexp.c b/ld/ldexp.c
index ab724074732..90760e0a8ca 100644
--- a/ld/ldexp.c
+++ b/ld/ldexp.c
@@ -340,8 +340,10 @@ update_definedness (const char *name, struct bfd_link_hash_entry *h)
}
static void
-fold_segment_end (seg_align_type *seg)
+fold_segment_end (void)
{
+ seg_align_type *seg = &expld.dataseg;
+
if (expld.phase == lang_first_phase_enum
|| expld.section != bfd_abs_section_ptr)
{
@@ -410,7 +412,7 @@ fold_unary (etree_type *tree)
break;
case DATA_SEGMENT_END:
- fold_segment_end (&expld.dataseg);
+ fold_segment_end ();
break;
default:
@@ -447,8 +449,10 @@ arith_result_section (const etree_value_type *lhs)
}
static void
-fold_segment_align (seg_align_type *seg, etree_value_type *lhs)
+fold_segment_align (etree_value_type *lhs)
{
+ seg_align_type *seg = &expld.dataseg;
+
seg->relro = exp_seg_relro_start;
if (expld.phase == lang_first_phase_enum
|| expld.section != bfd_abs_section_ptr)
@@ -494,8 +498,10 @@ fold_segment_align (seg_align_type *seg, etree_value_type *lhs)
}
static void
-fold_segment_relro_end (seg_align_type *seg, etree_value_type *lhs)
+fold_segment_relro_end (etree_value_type *lhs)
{
+ seg_align_type *seg = &expld.dataseg;
+
/* Operands swapped! XXX_SEGMENT_RELRO_END(offset,exp) has offset
in expld.result and exp in lhs. */
seg->relro = exp_seg_relro_end;
@@ -662,11 +668,11 @@ fold_binary (etree_type *tree)
break;
case DATA_SEGMENT_ALIGN:
- fold_segment_align (&expld.dataseg, &lhs);
+ fold_segment_align (&lhs);
break;
case DATA_SEGMENT_RELRO_END:
- fold_segment_relro_end (&expld.dataseg, &lhs);
+ fold_segment_relro_end (&lhs);
break;
default:
diff --git a/ld/ldlang.c b/ld/ldlang.c
index f481586a7ba..474784c874a 100644
--- a/ld/ldlang.c
+++ b/ld/ldlang.c
@@ -5665,9 +5665,10 @@ os_region_check (lang_output_section_statement_type *os,
}
static void
-ldlang_check_relro_region (lang_statement_union_type *s,
- seg_align_type *seg)
+ldlang_check_relro_region (lang_statement_union_type *s)
{
+ seg_align_type *seg = &expld.dataseg;
+
if (seg->relro == exp_seg_relro_start)
{
if (!seg->relro_start_stat)
@@ -6166,7 +6167,7 @@ lang_size_sections_1
output_section_statement->bfd_section,
&newdot);
- ldlang_check_relro_region (s, &expld.dataseg);
+ ldlang_check_relro_region (s);
expld.dataseg.relro = exp_seg_relro_none;
@@ -6346,10 +6347,11 @@ one_lang_size_sections_pass (bool *relax, bool check_regions)
}
static bool
-lang_size_segment (seg_align_type *seg)
+lang_size_segment (void)
{
/* If XXX_SEGMENT_ALIGN XXX_SEGMENT_END pair was seen, check whether
a page could be saved in the data segment. */
+ seg_align_type *seg = &expld.dataseg;
bfd_vma first, last;
first = -seg->base & (seg->commonpagesize - 1);
@@ -6368,8 +6370,9 @@ lang_size_segment (seg_align_type *seg)
}
static bfd_vma
-lang_size_relro_segment_1 (seg_align_type *seg)
+lang_size_relro_segment_1 (void)
{
+ seg_align_type *seg = &expld.dataseg;
bfd_vma relro_end, desired_end;
asection *sec;
@@ -6415,7 +6418,7 @@ lang_size_relro_segment (bool *relax, bool check_regions)
if (link_info.relro && expld.dataseg.relro_end)
{
bfd_vma data_initial_base = expld.dataseg.base;
- bfd_vma data_relro_end = lang_size_relro_segment_1 (&expld.dataseg);
+ bfd_vma data_relro_end = lang_size_relro_segment_1 ();
lang_reset_memory_regions ();
one_lang_size_sections_pass (relax, check_regions);
@@ -6424,11 +6427,11 @@ lang_size_relro_segment (bool *relax, bool check_regions)
script have increased padding over the original. Revert. */
if (expld.dataseg.relro_end > data_relro_end)
{
- expld.dataseg.base = data_initial_base;;
+ expld.dataseg.base = data_initial_base;
do_reset = true;
}
}
- else if (lang_size_segment (&expld.dataseg))
+ else if (lang_size_segment ())
do_reset = true;
return do_reset;
@@ -7679,7 +7682,6 @@ find_relro_section_callback (lang_wild_statement_type *ptr ATTRIBUTE_UNUSED,
static void
lang_find_relro_sections_1 (lang_statement_union_type *s,
- seg_align_type *seg,
bool *has_relro_section)
{
if (*has_relro_section)
@@ -7687,7 +7689,7 @@ lang_find_relro_sections_1 (lang_statement_union_type *s,
for (; s != NULL; s = s->header.next)
{
- if (s == seg->relro_end_stat)
+ if (s == expld.dataseg.relro_end_stat)
break;
switch (s->header.type)
@@ -7699,15 +7701,15 @@ lang_find_relro_sections_1 (lang_statement_union_type *s,
break;
case lang_constructors_statement_enum:
lang_find_relro_sections_1 (constructor_list.head,
- seg, has_relro_section);
+ has_relro_section);
break;
case lang_output_section_statement_enum:
lang_find_relro_sections_1 (s->output_section_statement.children.head,
- seg, has_relro_section);
+ has_relro_section);
break;
case lang_group_statement_enum:
lang_find_relro_sections_1 (s->group_statement.children.head,
- seg, has_relro_section);
+ has_relro_section);
break;
default:
break;
@@ -7723,7 +7725,7 @@ lang_find_relro_sections (void)
/* Check all sections in the link script. */
lang_find_relro_sections_1 (expld.dataseg.relro_start_stat,
- &expld.dataseg, &has_relro_section);
+ &has_relro_section);
if (!has_relro_section)
link_info.relro = false;
prev parent reply other threads:[~2022-02-08 1:09 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-08 1:08 [PATCH 0/4] PR28824, relro security issues Alan Modra
2022-02-08 1:08 ` [PATCH 1/4] " Alan Modra
2022-02-08 1:08 ` [PATCH 2/4] PR28824, relro security issues, x86 keep COMMONPAGESIZE relro Alan Modra
2022-02-14 2:18 ` Alan Modra
2022-02-14 3:13 ` H.J. Lu
2022-02-08 1:08 ` [PATCH 3/4] Remove bfd ELF_RELROPAGESIZE Alan Modra
2022-02-08 1:08 ` Alan Modra [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220208010833.2103874-5-amodra@gmail.com \
--to=amodra@gmail.com \
--cc=binutils@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).