diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2020-02-04 12:04:59 +0100 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2020-02-04 18:10:13 +0100 |
| commit | 1b310cff0f108cee59974f3c98dbd403da2960a0 (patch) | |
| tree | 0fab2d9e2b830f71e44eaf045c9b88cbe29e46d6 /target/linux/generic/hack-4.14 | |
| parent | 536adedcd3e05f9a4f362b218317facb35843cf5 (diff) | |
| download | upstream-1b310cff0f108cee59974f3c98dbd403da2960a0.tar.gz upstream-1b310cff0f108cee59974f3c98dbd403da2960a0.tar.bz2 upstream-1b310cff0f108cee59974f3c98dbd403da2960a0.zip | |
kernel: bump 4.14 to 4.14.169
Refreshed all patches.
Fixes:
- CVE-2019-14896
- CVE-2019-14897
Remove upstreamed:
- 023-0007-crypto-crypto4xx-Fix-wrong-ppc4xx_trng_probe-ppc4xx_.patch
- 001-4.22-01-MIPS-BCM63XX-drop-unused-and-broken-DSP-platform-dev.patch
Compile-tested on: cns3xxx
Runtime-tested on: cns3xxx
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/generic/hack-4.14')
| -rw-r--r-- | target/linux/generic/hack-4.14/645-netfilter-connmark-introduce-set-dscpmark.patch | 11 | ||||
| -rw-r--r-- | target/linux/generic/hack-4.14/702-phy_add_aneg_done_function.patch | 2 |
2 files changed, 4 insertions, 9 deletions
diff --git a/target/linux/generic/hack-4.14/645-netfilter-connmark-introduce-set-dscpmark.patch b/target/linux/generic/hack-4.14/645-netfilter-connmark-introduce-set-dscpmark.patch index 88c8c7f3ef..1ecc95bf22 100644 --- a/target/linux/generic/hack-4.14/645-netfilter-connmark-introduce-set-dscpmark.patch +++ b/target/linux/generic/hack-4.14/645-netfilter-connmark-introduce-set-dscpmark.patch @@ -80,11 +80,9 @@ Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> net/netfilter/xt_connmark.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) -diff --git a/net/netfilter/xt_connmark.c b/net/netfilter/xt_connmark.c -index ec377cc6a369..823d925b3aaf 100644 --- a/net/netfilter/xt_connmark.c +++ b/net/netfilter/xt_connmark.c -@@ -42,6 +42,7 @@ connmark_tg(struct sk_buff *skb, const struct xt_action_param *par) +@@ -42,6 +42,7 @@ connmark_tg(struct sk_buff *skb, const s enum ip_conntrack_info ctinfo; struct nf_conn *ct; u_int32_t newmark; @@ -92,7 +90,7 @@ index ec377cc6a369..823d925b3aaf 100644 ct = nf_ct_get(skb, &ctinfo); if (ct == NULL) -@@ -49,7 +50,21 @@ connmark_tg(struct sk_buff *skb, const struct xt_action_param *par) +@@ -49,7 +50,21 @@ connmark_tg(struct sk_buff *skb, const s switch (info->mode) { case XT_CONNMARK_SET: @@ -115,7 +113,7 @@ index ec377cc6a369..823d925b3aaf 100644 if (ct->mark != newmark) { ct->mark = newmark; nf_conntrack_event_cache(IPCT_MARK, ct); -@@ -57,7 +72,7 @@ connmark_tg(struct sk_buff *skb, const struct xt_action_param *par) +@@ -57,7 +72,7 @@ connmark_tg(struct sk_buff *skb, const s break; case XT_CONNMARK_SAVE: newmark = (ct->mark & ~info->ctmask) ^ @@ -124,6 +122,3 @@ index ec377cc6a369..823d925b3aaf 100644 if (ct->mark != newmark) { ct->mark = newmark; nf_conntrack_event_cache(IPCT_MARK, ct); --- -2.21.0 (Apple Git-122.2) - diff --git a/target/linux/generic/hack-4.14/702-phy_add_aneg_done_function.patch b/target/linux/generic/hack-4.14/702-phy_add_aneg_done_function.patch index 97bbee96a9..cc84311ef9 100644 --- a/target/linux/generic/hack-4.14/702-phy_add_aneg_done_function.patch +++ b/target/linux/generic/hack-4.14/702-phy_add_aneg_done_function.patch @@ -15,7 +15,7 @@ --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c -@@ -1461,6 +1461,9 @@ int genphy_update_link(struct phy_device +@@ -1462,6 +1462,9 @@ int genphy_update_link(struct phy_device { int status; |