diff options
author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-08-05 12:21:47 +0200 |
---|---|---|
committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-08-06 11:56:18 +0200 |
commit | 958411aa611582d9482ae6d319e1a986f195a596 (patch) | |
tree | a9d01e8707ce38022ec5e6c349bc1b8fd75f643b /target/linux/generic/pending-4.14/203-kallsyms_uncompressed.patch | |
parent | 2807f84b629c1a05304e4b39447973084889d9de (diff) | |
download | upstream-958411aa611582d9482ae6d319e1a986f195a596.tar.gz upstream-958411aa611582d9482ae6d319e1a986f195a596.tar.bz2 upstream-958411aa611582d9482ae6d319e1a986f195a596.zip |
kernel: bump 4.14 to 4.14.136
Refreshed all patches.
Altered patches:
- 306-v4.16-netfilter-remove-saveroute-indirection-in-struct-nf_.patch
Remove upstreamed:
- 505-arm64-dts-marvell-Fix-A37xx-UART0-register-size
Fixes:
- CVE-2019-13648
- CVE-2019-10207
Compile-tested on: cns3xxx
Runtime-tested on: cns3xxx
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/generic/pending-4.14/203-kallsyms_uncompressed.patch')
-rw-r--r-- | target/linux/generic/pending-4.14/203-kallsyms_uncompressed.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/pending-4.14/203-kallsyms_uncompressed.patch b/target/linux/generic/pending-4.14/203-kallsyms_uncompressed.patch index 5f66c3d501..b0cd863be4 100644 --- a/target/linux/generic/pending-4.14/203-kallsyms_uncompressed.patch +++ b/target/linux/generic/pending-4.14/203-kallsyms_uncompressed.patch @@ -65,7 +65,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> static int absolute_percpu = 0; static char symbol_prefix_char = '\0'; static int base_relative = 0; -@@ -458,6 +459,9 @@ static void write_src(void) +@@ -461,6 +462,9 @@ static void write_src(void) free(markers); @@ -75,7 +75,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> output_label("kallsyms_token_table"); off = 0; for (i = 0; i < 256; i++) { -@@ -516,6 +520,9 @@ static void *find_token(unsigned char *s +@@ -519,6 +523,9 @@ static void *find_token(unsigned char *s { int i; @@ -85,7 +85,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> for (i = 0; i < len - 1; i++) { if (str[i] == token[0] && str[i+1] == token[1]) return &str[i]; -@@ -588,6 +595,9 @@ static void optimize_result(void) +@@ -591,6 +598,9 @@ static void optimize_result(void) { int i, best; @@ -95,7 +95,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> /* using the '\0' symbol last allows compress_symbols to use standard * fast string functions */ for (i = 255; i >= 0; i--) { -@@ -776,6 +786,8 @@ int main(int argc, char **argv) +@@ -779,6 +789,8 @@ int main(int argc, char **argv) symbol_prefix_char = *p; } else if (strcmp(argv[i], "--base-relative") == 0) base_relative = 1; |