diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-12-18 16:38:57 +0100 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2019-12-24 15:34:43 +0100 |
| commit | e115fa478fb3914db2f414d642254ff09f04bc09 (patch) | |
| tree | 43278ae296fd8b569b2c9bc93fb3a09a45193f14 /target/linux/generic/pending-4.19/640-netfilter-nf_flow_table-add-hardware-offload-support.patch | |
| parent | 7604e53d5f593120449cdaf059bfaf66ec07607e (diff) | |
| download | upstream-e115fa478fb3914db2f414d642254ff09f04bc09.tar.gz upstream-e115fa478fb3914db2f414d642254ff09f04bc09.tar.bz2 upstream-e115fa478fb3914db2f414d642254ff09f04bc09.zip | |
kernel: bump 4.19 to 4.19.90
Refreshed all patches.
Remove upstreamed:
- 010-dmaengine-dw-dmac-implement-dma-prot.patch
- 950-0148-Increase-firmware-call-buffer-size-to-48-bytes.patch
- 950-0206-Mailbox-firmware-calls-now-use-kmalloc-2749.patch
- 402-leds-trigger-netdev-fix-handling-on-interface-rename.patch
Fixes:
- CVE-2019-19332
Compile-tested on: cns3xxx
Runtime-tested on: cns3xxx
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
[Add 010-dt-bindings-dmaengine-dw-dmac-add-protection-control.patch]
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/generic/pending-4.19/640-netfilter-nf_flow_table-add-hardware-offload-support.patch')
| -rw-r--r-- | target/linux/generic/pending-4.19/640-netfilter-nf_flow_table-add-hardware-offload-support.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/pending-4.19/640-netfilter-nf_flow_table-add-hardware-offload-support.patch b/target/linux/generic/pending-4.19/640-netfilter-nf_flow_table-add-hardware-offload-support.patch index dcd9b187c3..0a1e017f89 100644 --- a/target/linux/generic/pending-4.19/640-netfilter-nf_flow_table-add-hardware-offload-support.patch +++ b/target/linux/generic/pending-4.19/640-netfilter-nf_flow_table-add-hardware-offload-support.patch @@ -506,7 +506,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> +MODULE_ALIAS("nf-flow-table-hw"); --- a/net/netfilter/nf_tables_api.c +++ b/net/netfilter/nf_tables_api.c -@@ -5473,6 +5473,13 @@ static int nf_tables_flowtable_parse_hoo +@@ -5470,6 +5470,13 @@ static int nf_tables_flowtable_parse_hoo if (err < 0) return err; @@ -520,7 +520,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> ops = kcalloc(n, sizeof(struct nf_hook_ops), GFP_KERNEL); if (!ops) return -ENOMEM; -@@ -5604,10 +5611,19 @@ static int nf_tables_newflowtable(struct +@@ -5601,10 +5608,19 @@ static int nf_tables_newflowtable(struct } flowtable->data.type = type; @@ -540,7 +540,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> err = nf_tables_flowtable_parse_hook(&ctx, nla[NFTA_FLOWTABLE_HOOK], flowtable); if (err < 0) -@@ -5733,7 +5749,8 @@ static int nf_tables_fill_flowtable_info +@@ -5730,7 +5746,8 @@ static int nf_tables_fill_flowtable_info nla_put_string(skb, NFTA_FLOWTABLE_NAME, flowtable->name) || nla_put_be32(skb, NFTA_FLOWTABLE_USE, htonl(flowtable->use)) || nla_put_be64(skb, NFTA_FLOWTABLE_HANDLE, cpu_to_be64(flowtable->handle), |