From 9fe4e49025aeb638905661f3412df2eca5b2cfde Mon Sep 17 00:00:00 2001 From: Jiri Slaby Date: May 17 2023 19:15:58 +0000 Subject: Revert "net/sched: flower: Fix wrong handle assignment during filter change" (bsc#1012628). --- diff --git a/patches.kernel.org/6.3.3-212-Revert-net-sched-flower-Fix-wrong-handle-assign.patch b/patches.kernel.org/6.3.3-212-Revert-net-sched-flower-Fix-wrong-handle-assign.patch new file mode 100644 index 0000000..149061e --- /dev/null +++ b/patches.kernel.org/6.3.3-212-Revert-net-sched-flower-Fix-wrong-handle-assign.patch @@ -0,0 +1,39 @@ +From: Vlad Buslov +Date: Thu, 4 May 2023 20:16:15 +0200 +Subject: [PATCH] Revert "net/sched: flower: Fix wrong handle assignment during + filter change" +References: bsc#1012628 +Patch-mainline: 6.3.3 +Git-commit: 5110f3ff6d3c986df9575c8da86630578b7f0846 + +commit 5110f3ff6d3c986df9575c8da86630578b7f0846 upstream. + +This reverts commit 32eff6bacec2cb574677c15378169a9fa30043ef. + +Superseded by the following commit in this series. + +Signed-off-by: Vlad Buslov +Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Jiri Slaby +--- + net/sched/cls_flower.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/net/sched/cls_flower.c b/net/sched/cls_flower.c +index 72edaa62..a1c4ee2e 100644 +--- a/net/sched/cls_flower.c ++++ b/net/sched/cls_flower.c +@@ -2231,8 +2231,8 @@ static int fl_change(struct net *net, struct sk_buff *in_skb, + kfree(fnew); + goto errout_tb; + } +- fnew->handle = handle; + } ++ fnew->handle = handle; + + err = tcf_exts_init_ex(&fnew->exts, net, TCA_FLOWER_ACT, 0, tp, handle, + !tc_skip_hw(fnew->flags)); +-- +2.35.3 + diff --git a/series.conf b/series.conf index 7fdb5f1..15613ef 100644 --- a/series.conf +++ b/series.conf @@ -945,6 +945,7 @@ patches.kernel.org/6.3.3-209-HID-wacom-Set-a-default-resolution-for-older-ta.patch patches.kernel.org/6.3.3-210-HID-wacom-insert-timestamp-to-packed-Bluetooth-.patch patches.kernel.org/6.3.3-211-fs-ntfs3-Refactoring-of-various-minor-issues.patch + patches.kernel.org/6.3.3-212-Revert-net-sched-flower-Fix-wrong-handle-assign.patch ######################################################## # Build fixes that apply to the vanilla kernel too.