aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/hack-5.10
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@nbd.name>2021-11-30 11:37:15 +0100
committerFelix Fietkau <nbd@nbd.name>2021-12-11 13:52:39 +0100
commit3b20eb185b2a45681fa9e2d31b9844458d5a72d2 (patch)
treec1840844679a4eda898bd93cc00aabcd791c2907 /target/linux/generic/hack-5.10
parent56b14fdeb24b63b26ae948aa2fa6b1ce4b9df1fd (diff)
downloadupstream-3b20eb185b2a45681fa9e2d31b9844458d5a72d2.tar.gz
upstream-3b20eb185b2a45681fa9e2d31b9844458d5a72d2.tar.bz2
upstream-3b20eb185b2a45681fa9e2d31b9844458d5a72d2.zip
kernel: fix RCU issue in xt_FLOWOFFLOAD patch
cond_resched() may not be called in a rcu-locked section Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'target/linux/generic/hack-5.10')
-rw-r--r--target/linux/generic/hack-5.10/650-netfilter-add-xt_FLOWOFFLOAD-target.patch4
1 files changed, 1 insertions, 3 deletions
diff --git a/target/linux/generic/hack-5.10/650-netfilter-add-xt_FLOWOFFLOAD-target.patch b/target/linux/generic/hack-5.10/650-netfilter-add-xt_FLOWOFFLOAD-target.patch
index 77c24ccc7a..bda8d06b7c 100644
--- a/target/linux/generic/hack-5.10/650-netfilter-add-xt_FLOWOFFLOAD-target.patch
+++ b/target/linux/generic/hack-5.10/650-netfilter-add-xt_FLOWOFFLOAD-target.patch
@@ -98,7 +98,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
obj-$(CONFIG_NETFILTER_XT_TARGET_LED) += xt_LED.o
--- /dev/null
+++ b/net/netfilter/xt_FLOWOFFLOAD.c
-@@ -0,0 +1,658 @@
+@@ -0,0 +1,656 @@
+/*
+ * Copyright (C) 2018-2021 Felix Fietkau <nbd@nbd.name>
+ *
@@ -278,8 +278,6 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
+ hook->used = true;
+ }
+ spin_unlock_bh(&hooks_lock);
-+
-+ cond_resched();
+}
+
+static void