diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-07-29 16:05:04 +0200 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-07-31 16:51:46 +0200 |
| commit | 1d45ed1477571d0dd3d7d39dd9b45d2a05c57a0a (patch) | |
| tree | f5f3c4c10dc72357c1b80593b0aa003425c84602 /target/linux/generic/hack-4.14 | |
| parent | 7228904092d9faddd9b17a3a9aa3aa41406fa890 (diff) | |
| download | upstream-1d45ed1477571d0dd3d7d39dd9b45d2a05c57a0a.tar.gz upstream-1d45ed1477571d0dd3d7d39dd9b45d2a05c57a0a.tar.bz2 upstream-1d45ed1477571d0dd3d7d39dd9b45d2a05c57a0a.zip | |
kernel: bump 4.14 to 4.14.134
Refreshed all patches.
Remove upstreamed:
- 049-v4.20-mips-remove-superfluous-check-for-linux.patch
- 303-MIPS-Fix-bounds-check-virt_addr_valid.patch
Fixes:
- CVE-2019-3846
- CVE-2019-3900
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-savedscp.patch | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/target/linux/generic/hack-4.14/645-netfilter-connmark-introduce-savedscp.patch b/target/linux/generic/hack-4.14/645-netfilter-connmark-introduce-savedscp.patch index 1681ed5db8..5217eca582 100644 --- a/target/linux/generic/hack-4.14/645-netfilter-connmark-introduce-savedscp.patch +++ b/target/linux/generic/hack-4.14/645-netfilter-connmark-introduce-savedscp.patch @@ -49,8 +49,6 @@ Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> net/netfilter/xt_connmark.c | 21 ++++++++++++++++++++- 2 files changed, 22 insertions(+), 2 deletions(-) -diff --git a/include/uapi/linux/netfilter/xt_connmark.h b/include/uapi/linux/netfilter/xt_connmark.h -index 408a9654f05c..e63ad3c89b92 100644 --- a/include/uapi/linux/netfilter/xt_connmark.h +++ b/include/uapi/linux/netfilter/xt_connmark.h @@ -16,7 +16,8 @@ @@ -63,11 +61,9 @@ index 408a9654f05c..e63ad3c89b92 100644 }; struct xt_connmark_tginfo1 { -diff --git a/net/netfilter/xt_connmark.c b/net/netfilter/xt_connmark.c -index ec377cc6a369..aa5bcea8f9ba 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; @@ -75,7 +71,7 @@ index ec377cc6a369..aa5bcea8f9ba 100644 ct = nf_ct_get(skb, &ctinfo); if (ct == NULL) -@@ -57,7 +58,25 @@ connmark_tg(struct sk_buff *skb, const struct xt_action_param *par) +@@ -57,7 +58,25 @@ connmark_tg(struct sk_buff *skb, const s break; case XT_CONNMARK_SAVE: newmark = (ct->mark & ~info->ctmask) ^ @@ -102,6 +98,3 @@ index ec377cc6a369..aa5bcea8f9ba 100644 if (ct->mark != newmark) { ct->mark = newmark; nf_conntrack_event_cache(IPCT_MARK, ct); --- -2.20.1 (Apple Git-117) - |