mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-20 22:23:27 +00:00
b3f95490b9
This adds initial support for kernel 4.14 based on the patches for kernel 4.9. In the configuration I deactivated some of the new possible security features like: CONFIG_REFCOUNT_FULL CONFIG_SLAB_FREELIST_HARDENED CONFIG_SOFTLOCKUP_DETECTOR CONFIG_WARN_ALL_UNSEEDED_RANDOM And these overlay FS options are also deactivated: CONFIG_OVERLAY_FS_INDEX CONFIG_OVERLAY_FS_REDIRECT_DIR I activated this: CONFIG_FORTIFY_SOURCE CONFIG_POSIX_TIMERS CONFIG_SLAB_MERGE_DEFAULT CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED I am not sure if I did the porting correct for the following patches: target/linux/generic/backport-4.14/020-backport_netfilter_rtcache.patch target/linux/generic/hack-4.14/220-gc_sections.patch target/linux/generic/hack-4.14/321-powerpc_crtsavres_prereq.patch target/linux/generic/pending-4.14/305-mips_module_reloc.patch target/linux/generic/pending-4.14/611-netfilter_match_bypass_default_table.patch target/linux/generic/pending-4.14/680-NET-skip-GRO-for-foreign-MAC-addresses.patch Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
46 lines
1.2 KiB
Diff
46 lines
1.2 KiB
Diff
From: Felix Fietkau <nbd@nbd.name>
|
|
Subject: kernel: when KALLSYMS is disabled, print module address + size for matching backtrace entries
|
|
|
|
[john@phrozen.org: felix will add this to his upstream queue]
|
|
|
|
lede-commit 53827cdc824556cda910b23ce5030c363b8f1461
|
|
Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|
---
|
|
lib/vsprintf.c | 15 +++++++++++----
|
|
1 file changed, 11 insertions(+), 4 deletions(-)
|
|
|
|
--- a/lib/vsprintf.c
|
|
+++ b/lib/vsprintf.c
|
|
@@ -670,8 +670,10 @@ char *symbol_string(char *buf, char *end
|
|
struct printf_spec spec, const char *fmt)
|
|
{
|
|
unsigned long value;
|
|
-#ifdef CONFIG_KALLSYMS
|
|
char sym[KSYM_SYMBOL_LEN];
|
|
+#ifndef CONFIG_KALLSYMS
|
|
+ struct module *mod;
|
|
+ int len;
|
|
#endif
|
|
|
|
if (fmt[1] == 'R')
|
|
@@ -685,11 +687,16 @@ char *symbol_string(char *buf, char *end
|
|
sprint_symbol(sym, value);
|
|
else
|
|
sprint_symbol_no_offset(sym, value);
|
|
-
|
|
- return string(buf, end, sym, spec);
|
|
#else
|
|
- return special_hex_number(buf, end, value, sizeof(void *));
|
|
+ len = snprintf(sym, sizeof(sym), "0x%lx", value);
|
|
+
|
|
+ mod = __module_address(value);
|
|
+ if (mod)
|
|
+ snprintf(sym + len, sizeof(sym) - len, " [%s@%p+0x%x]",
|
|
+ mod->name, mod->core_layout.base,
|
|
+ mod->core_layout.size);
|
|
#endif
|
|
+ return string(buf, end, sym, spec);
|
|
}
|
|
|
|
static noinline_for_stack
|