aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/pending-5.10/611-netfilter_match_bypass_default_table.patch
diff options
context:
space:
mode:
authorKevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>2021-03-30 22:01:27 +0100
committerKevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>2021-04-03 21:07:22 +0100
commit438e88e672559e349d05540db8763a890a931ad7 (patch)
tree58c0d48f2a0974c5aebfbeee1abbaa57dbaf4f25 /target/linux/generic/pending-5.10/611-netfilter_match_bypass_default_table.patch
parentb974293efa24b8e1bf859b1ed253ca0042ab273e (diff)
downloadupstream-438e88e672559e349d05540db8763a890a931ad7.tar.gz
upstream-438e88e672559e349d05540db8763a890a931ad7.tar.bz2
upstream-438e88e672559e349d05540db8763a890a931ad7.zip
kernel: bump 5.10 to 5.10.27
Use update_kernel to refresh all patches, required manual updates to: 610-netfilter_match_bypass_default_checks.patch 611-netfilter_match_bypass_default_table.patch 762-net-bridge-switchdev-Refactor-br_switchdev_fdb_notif.patch 764-net-bridge-switchdev-Send-FDB-notifications-for-host.patch Run-tested: x86_64 Nothing screamed out but any funny business with linux bridging should suspect this update first. Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
Diffstat (limited to 'target/linux/generic/pending-5.10/611-netfilter_match_bypass_default_table.patch')
-rw-r--r--target/linux/generic/pending-5.10/611-netfilter_match_bypass_default_table.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/pending-5.10/611-netfilter_match_bypass_default_table.patch b/target/linux/generic/pending-5.10/611-netfilter_match_bypass_default_table.patch
index 1792534835..baf738a8d2 100644
--- a/target/linux/generic/pending-5.10/611-netfilter_match_bypass_default_table.patch
+++ b/target/linux/generic/pending-5.10/611-netfilter_match_bypass_default_table.patch
@@ -48,7 +48,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
/* Initialization */
+ WARN_ON(!(table->valid_hooks & (1 << hook)));
+ local_bh_disable();
-+ private = rcu_access_pointer(table->private);
++ private = READ_ONCE(table->private); /* Address dependency. */
+ cpu = smp_processor_id();
+ table_base = private->entries;
+
@@ -80,7 +80,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
- WARN_ON(!(table->valid_hooks & (1 << hook)));
- local_bh_disable();
addend = xt_write_recseq_begin();
-- private = rcu_access_pointer(table->private);
+- private = READ_ONCE(table->private); /* Address dependency. */
- cpu = smp_processor_id();
- table_base = private->entries;
jumpstack = (struct ipt_entry **)private->jumpstack[cpu];