[openwrt/openwrt] kernel: fix RCU issue in xt_FLOWOFFLOAD patch

LEDE Commits lede-commits at lists.infradead.org
Sat Dec 11 04:52:50 PST 2021


nbd pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/3b20eb185b2a45681fa9e2d31b9844458d5a72d2

commit 3b20eb185b2a45681fa9e2d31b9844458d5a72d2
Author: Felix Fietkau <nbd at nbd.name>
AuthorDate: Tue Nov 30 11:37:15 2021 +0100

    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 at nbd.name>
---
 .../generic/hack-5.10/650-netfilter-add-xt_FLOWOFFLOAD-target.patch   | 4 +---
 1 file changed, 1 insertion(+), 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 at 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 at nbd.name>
 + *
@@ -278,8 +278,6 @@ Signed-off-by: Felix Fietkau <nbd at nbd.name>
 +		hook->used = true;
 +	}
 +	spin_unlock_bh(&hooks_lock);
-+
-+	cond_resched();
 +}
 +
 +static void



More information about the lede-commits mailing list