aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/hack-4.14/901-debloat_sock_diag.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2020-07-04 00:54:41 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2020-07-04 21:12:42 +0200
commitce958dd88a7e74cd7aa7c345c97c79556bc2d926 (patch)
tree2a92f6397265cca8137812de80713ea1171287a6 /target/linux/generic/hack-4.14/901-debloat_sock_diag.patch
parent78b632134f1597e4cc6498a7bb913c4f9b036caf (diff)
downloadupstream-ce958dd88a7e74cd7aa7c345c97c79556bc2d926.tar.gz
upstream-ce958dd88a7e74cd7aa7c345c97c79556bc2d926.tar.bz2
upstream-ce958dd88a7e74cd7aa7c345c97c79556bc2d926.zip
kernel: Update kernel 4.14 to version 4.14.187
Fixes: - CVE-2020-10757 The "mtd: rawnand: Pass a nand_chip object to nand_release()" commit was backported which needed some adaptations to other code. Build tested: ramips Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/generic/hack-4.14/901-debloat_sock_diag.patch')
-rw-r--r--target/linux/generic/hack-4.14/901-debloat_sock_diag.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/generic/hack-4.14/901-debloat_sock_diag.patch b/target/linux/generic/hack-4.14/901-debloat_sock_diag.patch
index a4ca573569..2f2b8eb705 100644
--- a/target/linux/generic/hack-4.14/901-debloat_sock_diag.patch
+++ b/target/linux/generic/hack-4.14/901-debloat_sock_diag.patch
@@ -61,7 +61,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
struct dst_entry *__sk_dst_check(struct sock *sk, u32 cookie)
{
struct dst_entry *dst = __sk_dst_get(sk);
-@@ -1598,9 +1610,11 @@ void sk_destruct(struct sock *sk)
+@@ -1599,9 +1611,11 @@ void sk_destruct(struct sock *sk)
static void __sk_free(struct sock *sk)
{