diff options
| author | Stijn Segers <foss@volatilesystems.org> | 2018-03-02 08:31:03 +0100 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2018-03-03 12:58:56 +0100 |
| commit | e72b2464b15f4a8dbe2d443a57ff7aa761990da8 (patch) | |
| tree | e78268dfec1c0634fcc363932b9d2477cf0372cc /target/linux/generic/pending-4.4/610-netfilter_match_bypass_default_checks.patch | |
| parent | 5af85dab22a2ae78194d54d30c33fc2c1fb0f4e5 (diff) | |
| download | upstream-e72b2464b15f4a8dbe2d443a57ff7aa761990da8.tar.gz upstream-e72b2464b15f4a8dbe2d443a57ff7aa761990da8.tar.bz2 upstream-e72b2464b15f4a8dbe2d443a57ff7aa761990da8.zip | |
kernel: bump 4.4 to 4.4.119
This bumps the 4.4. kernel in master to 4.4.119.
Includes 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)
* Deleted 650-pppoe_header_pad.patch (does not apply anymore (code was replaced)).
Bumps from 4.4.112 to 4.4.115 were handled by Kevin Darbyshire-Bryant.
Compile-tested on: ar71xx & oxnas.
Signed-off-by: Stijn Segers <foss@volatilesystems.org>
Tested-by: Rosen Penev <rosenp@gmail.com>
Diffstat (limited to 'target/linux/generic/pending-4.4/610-netfilter_match_bypass_default_checks.patch')
| -rw-r--r-- | target/linux/generic/pending-4.4/610-netfilter_match_bypass_default_checks.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/target/linux/generic/pending-4.4/610-netfilter_match_bypass_default_checks.patch b/target/linux/generic/pending-4.4/610-netfilter_match_bypass_default_checks.patch index 8b96639c7f..dce8020c92 100644 --- a/target/linux/generic/pending-4.4/610-netfilter_match_bypass_default_checks.patch +++ b/target/linux/generic/pending-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)) -@@ -975,6 +1004,14 @@ copy_entries_to_user(unsigned int total_ +@@ -980,6 +1009,14 @@ copy_entries_to_user(unsigned int total_ goto free_counters; } @@ -82,7 +82,7 @@ for (i = sizeof(struct ipt_entry); i < e->target_offset; i += m->u.match_size) { -@@ -1380,12 +1417,15 @@ compat_copy_entry_to_user(struct ipt_ent +@@ -1385,12 +1422,15 @@ compat_copy_entry_to_user(struct ipt_ent compat_uint_t origsize; const struct xt_entry_match *ematch; int ret = 0; |