From 37e9a7bfcaf98813b6748519c021ca2f572161da Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 12 Apr 2021 10:21:03 +0200 Subject: [PATCH] 5.11-stable patches added patches: revert-net-sched-bump-refcount-for-new-action-in-act-replace-mode.patch --- ...t-for-new-action-in-act-replace-mode.patch | 33 +++++++++++++++++++ queue-5.11/series | 1 + 2 files changed, 34 insertions(+) create mode 100644 queue-5.11/revert-net-sched-bump-refcount-for-new-action-in-act-replace-mode.patch diff --git a/queue-5.11/revert-net-sched-bump-refcount-for-new-action-in-act-replace-mode.patch b/queue-5.11/revert-net-sched-bump-refcount-for-new-action-in-act-replace-mode.patch new file mode 100644 index 00000000000..8bdf275f563 --- /dev/null +++ b/queue-5.11/revert-net-sched-bump-refcount-for-new-action-in-act-replace-mode.patch @@ -0,0 +1,33 @@ +From 4ba86128ba077fbb7d86516ae24ed642e6c3adef Mon Sep 17 00:00:00 2001 +From: Vlad Buslov +Date: Wed, 7 Apr 2021 18:36:02 +0300 +Subject: Revert "net: sched: bump refcount for new action in ACT replace mode" + +From: Vlad Buslov + +commit 4ba86128ba077fbb7d86516ae24ed642e6c3adef upstream. + +This reverts commit 6855e8213e06efcaf7c02a15e12b1ae64b9a7149. + +Following commit in series fixes the issue without introducing regression +in error rollback of tcf_action_destroy(). + +Signed-off-by: Vlad Buslov +Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman +--- + net/sched/act_api.c | 3 --- + 1 file changed, 3 deletions(-) + +--- a/net/sched/act_api.c ++++ b/net/sched/act_api.c +@@ -1049,9 +1049,6 @@ struct tc_action *tcf_action_init_1(stru + if (!name) + a->hw_stats = hw_stats; + +- if (!bind && ovr && err == ACT_P_CREATED) +- refcount_set(&a->tcfa_refcnt, 2); +- + return a; + + err_out: diff --git a/queue-5.11/series b/queue-5.11/series index 1683ea0a879..59753f29309 100644 --- a/queue-5.11/series +++ b/queue-5.11/series @@ -207,3 +207,4 @@ net-ieee802154-fix-nl802154-del-llsec-devkey.patch net-ieee802154-forbid-monitor-for-set-llsec-params.patch net-ieee802154-forbid-monitor-for-del-llsec-seclevel.patch net-ieee802154-stop-dump-llsec-params-for-monitors.patch +revert-net-sched-bump-refcount-for-new-action-in-act-replace-mode.patch -- 2.47.3