mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-28 01:28:59 +00:00
f49d4aebe2
CONFIG_FORTIFY_SOURCE=y is already set in the generic kernel
configuration, but it is not working for MIPS on kernel 5.4, support for
MIPS was only added with kernel 5.5, other architectures like aarch64
support FORTIFY_SOURCE already since some time.
This patch adds support for FORTIFY_SOURCE to MIPS with kernel 5.4,
kernel 5.10 already supports this and needs no changes.
This backports one patch from kernel 5.5 and one fix from 5.8 to make
fortify source also work on our kernel 5.4.
The changes are not compatible with the
306-mips_mem_functions_performance.patch patch which was also removed
with kernel 5.10, probably because of the same problems. I think it is
not needed anyway as the compiler should automatically optimize the
calls to memset(), memcpy() and memmove() even when not explicitly
telling the compiler to use the build in variant.
This increases the size of an uncompressed kernel by less than 1 KB.
Acked-by: Rosen Penev <rosenp@gmail.com>
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
(cherry picked from commit 9ffa2f8193)
39 lines
922 B
Diff
39 lines
922 B
Diff
From: John Crispin <john@phrozen.org>
|
|
Subject: hack: kernel: add generic image_cmdline hack to MIPS targets
|
|
|
|
lede-commit: d59f5b3a987a48508257a0ddbaeadc7909f9f976
|
|
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
|
|
---
|
|
arch/mips/Kconfig | 4 ++++
|
|
arch/mips/kernel/head.S | 6 ++++++
|
|
2 files changed, 10 insertions(+)
|
|
|
|
--- a/arch/mips/Kconfig
|
|
+++ b/arch/mips/Kconfig
|
|
@@ -1159,6 +1159,10 @@ config SYNC_R4K
|
|
config MIPS_MACHINE
|
|
def_bool n
|
|
|
|
+config IMAGE_CMDLINE_HACK
|
|
+ bool "OpenWrt specific image command line hack"
|
|
+ default n
|
|
+
|
|
config NO_IOPORT_MAP
|
|
def_bool n
|
|
|
|
--- a/arch/mips/kernel/head.S
|
|
+++ b/arch/mips/kernel/head.S
|
|
@@ -79,6 +79,12 @@ FEXPORT(__kernel_entry)
|
|
j kernel_entry
|
|
#endif /* CONFIG_BOOT_RAW */
|
|
|
|
+#ifdef CONFIG_IMAGE_CMDLINE_HACK
|
|
+ .ascii "CMDLINE:"
|
|
+EXPORT(__image_cmdline)
|
|
+ .fill 0x400
|
|
+#endif /* CONFIG_IMAGE_CMDLINE_HACK */
|
|
+
|
|
__REF
|
|
|
|
NESTED(kernel_entry, 16, sp) # kernel entry point
|