diff options
| author | Stijn Segers <foss@volatilesystems.org> | 2018-02-18 21:48:09 +0100 |
|---|---|---|
| committer | John Crispin <john@phrozen.org> | 2018-02-20 08:34:14 +0100 |
| commit | b934aa2f2144357ce5f9a62d3fcd2f326e8e9b2b (patch) | |
| tree | e224719f4bb95e1600b00dc613920cb32b523375 /target/linux/generic/patches-4.4/610-netfilter_match_bypass_default_checks.patch | |
| parent | b3b16c8ce5c616a0d1f84c4263b4067ff099aa1e (diff) | |
| download | mtk-20170518-b934aa2f2144357ce5f9a62d3fcd2f326e8e9b2b.zip mtk-20170518-b934aa2f2144357ce5f9a62d3fcd2f326e8e9b2b.tar.gz mtk-20170518-b934aa2f2144357ce5f9a62d3fcd2f326e8e9b2b.tar.bz2 | |
kernel: update 17.01 kernel to 4.4.116
This bumps the 4.4. kernel in LEDE 17.01 to 4.4.116.
More Meltdown & Spectre mitigation.
* Refresh patches.
* Refresh x86/config for RETPOLINE.
* Deleted 8049-PCI-layerscape-Add-fsl-ls2085a-pcie-compatible-ID.patch (accepted upstream)
* Deleted 8050-PCI-layerscape-Fix-MSG-TLP-drop-setting.patch (accepted upstream)
* 650-pppoe_header_pad.patch does not apply anymore (code was replaced).
Bumps from 4.4.113 to 4.4.115 were handled by Kevin Darbyshire-Bryant.
Compile-tested on: ar71xx, ramips/mt7621, x86/64
Run-tested on: ar71xx, ramips/mt7621, x86/64
Signed-off-by: Stijn Segers <foss@volatilesystems.org>
Diffstat (limited to 'target/linux/generic/patches-4.4/610-netfilter_match_bypass_default_checks.patch')
| -rw-r--r-- | target/linux/generic/patches-4.4/610-netfilter_match_bypass_default_checks.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/target/linux/generic/patches-4.4/610-netfilter_match_bypass_default_checks.patch b/target/linux/generic/patches-4.4/610-netfilter_match_bypass_default_checks.patch index ea9558f..257bcf7 100644 --- a/target/linux/generic/patches-4.4/610-netfilter_match_bypass_default_checks.patch +++ b/target/linux/generic/patches-4.4/610-netfilter_match_bypass_default_checks.patch @@ -50,16 +50,16 @@ static bool ip_checkentry(const struct ipt_ip *ip) { -@@ -664,6 +690,8 @@ find_check_entry(struct ipt_entry *e, st - struct xt_mtchk_param mtpar; +@@ -655,6 +681,8 @@ find_check_entry(struct ipt_entry *e, st struct xt_entry_match *ematch; + unsigned long pcnt; + ip_checkdefault(&e->ip); + - e->counters.pcnt = xt_percpu_counter_alloc(); - if (IS_ERR_VALUE(e->counters.pcnt)) + pcnt = xt_percpu_counter_alloc(); + if (IS_ERR_VALUE(pcnt)) return -ENOMEM; -@@ -948,6 +976,7 @@ copy_entries_to_user(unsigned int total_ +@@ -953,6 +981,7 @@ copy_entries_to_user(unsigned int total_ const struct xt_table_info *private = table->private; int ret = 0; const void *loc_cpu_entry; @@ -67,7 +67,7 @@ counters = alloc_counters(table); if (IS_ERR(counters)) -@@ -974,6 +1003,14 @@ copy_entries_to_user(unsigned int total_ +@@ -979,6 +1008,14 @@ copy_entries_to_user(unsigned int total_ ret = -EFAULT; goto free_counters; } |