[PATCH v4 06/18] tools/nolibc: crt.h: initialize stack protector

From: Zhangjin Wu
Date: Sat Jul 15 2023 - 14:23:37 EST


As suggested by Thomas, It is able to move the stackprotector
initialization from the assembly _start to the beginning of the new
_start_c(). Let's call __stack_chk_init() in _start_c() as a
preparation.

Suggested-by: Thomas Weißschuh <linux@xxxxxxxxxxxxxx>
Link: https://lore.kernel.org/lkml/a00284a6-54b1-498c-92aa-44997fa78403@xxxxxxxx/
Signed-off-by: Zhangjin Wu <falcon@xxxxxxxxxxx>
---
tools/include/nolibc/crt.h | 4 ++++
1 file changed, 4 insertions(+)

diff --git a/tools/include/nolibc/crt.h b/tools/include/nolibc/crt.h
index 92a2a0478cb1..32e128b0fb62 100644
--- a/tools/include/nolibc/crt.h
+++ b/tools/include/nolibc/crt.h
@@ -10,6 +10,7 @@
char **environ __attribute__((weak));
const unsigned long *_auxv __attribute__((weak));

+void __stack_chk_init(void);
static void exit(int);

void _start_c(long *sp)
@@ -21,6 +22,9 @@ void _start_c(long *sp)
/* silence potential warning: conflicting types for 'main' */
int _nolibc_main(int, char **, char **) __asm__ ("main");

+ /* initialize stack protector */
+ __stack_chk_init();
+
/*
* sp : argc <-- argument count, required by main()
* argv: argv[0] <-- argument vector, required by main()
--
2.25.1