5.10-stable patches

added patches:
	revert-net-sched-bump-refcount-for-new-action-in-act-replace-mode.patch

diff --git a/queue-5.10/revert-net-sched-bump-refcount-for-new-action-in-act-replace-mode.patch b/queue-5.10/revert-net-sched-bump-refcount-for-new-action-in-act-replace-mode.patch
new file mode 100644 (file)
index 0000000..1b99737
--- /dev/null
+++ b/queue-5.10/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 <vladbu@nvidia.com>
+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 <vladbu@nvidia.com>
+
+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 <vladbu@nvidia.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ net/sched/act_api.c |    3 ---
+ 1 file changed, 3 deletions(-)
+
+--- a/net/sched/act_api.c
++++ b/net/sched/act_api.c
+@@ -1029,9 +1029,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.10/series b/queue-5.10/series
index 72921296d685afa01859013ce33c4a65caba4c6f..116e5acd29fe8b144f3b5fdc1ddb0002ed7fffbe 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -185,3 +185,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