mirror of
https://github.com/crosstool-ng/crosstool-ng.git
synced 2025-01-11 15:33:09 +00:00
c175b21ce4
Bring in the fixes for GCC 7 through 13. https://rtx.meta.security/mitigation/2023/09/12/CVE-2023-4039.html https://developer.arm.com/Arm%20Security%20Center/GCC%20Stack%20Protector%20Vulnerability%20AArch64 Signed-off-by: Chris Packham <judge.packham@gmail.com>
50 lines
1.9 KiB
Diff
50 lines
1.9 KiB
Diff
From 78ebdb7b12d5e258b9811bab715734454268fd0c Mon Sep 17 00:00:00 2001
|
|
From: Richard Sandiford <richard.sandiford@arm.com>
|
|
Date: Fri, 16 Jun 2023 17:00:51 +0100
|
|
Subject: [PATCH 21/30] aarch64: Explicitly handle frames with no saved
|
|
registers
|
|
|
|
If a frame has no saved registers, it can be allocated in one go.
|
|
There is no need to treat the areas below and above the saved
|
|
registers as separate.
|
|
|
|
And if we allocate the frame in one go, it should be allocated
|
|
as the initial_adjust rather than the final_adjust. This allows the
|
|
frame size to grow to guard_size - guard_used_by_caller before a stack
|
|
probe is needed. (A frame with no register saves is necessarily a
|
|
leaf frame.)
|
|
|
|
This is a no-op as thing stand, since a leaf function will have
|
|
no outgoing arguments, and so all the frame will be above where
|
|
the saved registers normally go.
|
|
|
|
gcc/
|
|
* config/aarch64/aarch64.c (aarch64_layout_frame): Explicitly
|
|
allocate the frame in one go if there are no saved registers.
|
|
---
|
|
gcc/config/aarch64/aarch64.c | 8 +++++---
|
|
1 file changed, 5 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/gcc/config/aarch64/aarch64.c b/gcc/config/aarch64/aarch64.c
|
|
index a35dceab9fc7..e9dad682738f 100644
|
|
--- a/gcc/config/aarch64/aarch64.c
|
|
+++ b/gcc/config/aarch64/aarch64.c
|
|
@@ -4771,9 +4771,11 @@ aarch64_layout_frame (void)
|
|
max_push_offset = 256;
|
|
|
|
HOST_WIDE_INT const_size, const_fp_offset;
|
|
- if (cfun->machine->frame.frame_size.is_constant (&const_size)
|
|
- && const_size < max_push_offset
|
|
- && known_eq (crtl->outgoing_args_size, 0))
|
|
+ if (cfun->machine->frame.saved_regs_size == 0)
|
|
+ cfun->machine->frame.initial_adjust = cfun->machine->frame.frame_size;
|
|
+ else if (cfun->machine->frame.frame_size.is_constant (&const_size)
|
|
+ && const_size < max_push_offset
|
|
+ && known_eq (crtl->outgoing_args_size, 0))
|
|
{
|
|
/* Simple, small frame with no outgoing arguments:
|
|
stp reg1, reg2, [sp, -frame_size]!
|
|
--
|
|
2.42.0
|
|
|