dilim/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2026-08-09 17:38:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

sd-boot: efi-log: fix __stack_chk_guard type

Browse Source 
In https://gcc.gnu.org/PR121911 `gcc` started enforcing the type of
`__stack_chk_guard` to `uintptr_t` and broke `systemd` build as:

```
../src/boot/efi-log.c:136:17: error: conflicting types for '__stack_chk_guard'; have 'intptr_t' {aka 'long int'}
  136 | _used_ intptr_t __stack_chk_guard = (intptr_t) 0x70f6967de78acae3;
      |                 ^~~~~~~~~~~~~~~~~
cc1: note: previous declaration of '__stack_chk_guard' with type 'long unsigned int'
../src/boot/efi-log.c:136:17: error: declaration of '__stack_chk_guard' shadows a global declaration [-Werror=shadow]
  136 | _used_ intptr_t __stack_chk_guard = (intptr_t) 0x70f6967de78acae3;
      |                 ^~~~~~~~~~~~~~~~~
```

Let's match the declaration to unsigned type as suggested by upstream in
https://gcc.gnu.org/PR121911#c6.
This commit is contained in:
Sergei Trofimovich
2026-05-05 21:55:30 +01:00
committed by Lennart Poettering
parent 72fedd6037
commit fc68ee6118
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/boot/efi-log.c
View File

@@ -133,7 +133,7 @@ void log_wait(void) {
}
// NOLINTNEXTLINE(misc-use-internal-linkage)
_used_ intptr_t __stack_chk_guard = (intptr_t) 0x70f6967de78acae3;
_used_ uintptr_t __stack_chk_guard = (uintptr_t) 0x70f6967de78acae3;
/* We can only set a random stack canary if this function attribute is available,
* otherwise this may create a stack check fail. */
@@ -144,7 +144,7 @@ void __stack_chk_guard_init(void) {
(void) rng->GetRNG(rng, NULL, sizeof(__stack_chk_guard), (void *) &__stack_chk_guard);
else
/* Better than no extra entropy. */
__stack_chk_guard ^= (intptr_t) __executable_start;
__stack_chk_guard ^= (uintptr_t) __executable_start;
}
#endif