This is a note to let you know that I've just added the patch titled
Revert "net/sched: act_api: move TCA_EXT_WARN_MSG to the correct hierarchy"
to the 6.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
revert-net-sched-act_api-move-tca_ext_warn_msg-to-the-correct-hierarchy.patch
and it can be found in the queue-6.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 8de2bd02439eb839a452a853c1004c2c45ff6fef Mon Sep 17 00:00:00 2001
From: Hangbin Liu <liuhangbin@xxxxxxxxx>
Date: Thu, 16 Mar 2023 11:37:52 +0800
Subject: Revert "net/sched: act_api: move TCA_EXT_WARN_MSG to the correct hierarchy"
From: Hangbin Liu <liuhangbin@xxxxxxxxx>
commit 8de2bd02439eb839a452a853c1004c2c45ff6fef upstream.
This reverts commit 923b2e30dc9cd05931da0f64e2e23d040865c035.
This is not a correct fix as TCA_EXT_WARN_MSG is not a hierarchy to
TCA_ACT_TAB. I didn't notice the TC actions use different enum when adding
TCA_EXT_WARN_MSG. To fix the difference I will add a new WARN enum in
TCA_ROOT_MAX as Jamal suggested.
Signed-off-by: Hangbin Liu <liuhangbin@xxxxxxxxx>
Acked-by: Jamal Hadi Salim <jhs@xxxxxxxxxxxx>
Signed-off-by: Jakub Kicinski <kuba@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
net/sched/act_api.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- a/net/sched/act_api.c
+++ b/net/sched/act_api.c
@@ -1603,12 +1603,12 @@ static int tca_get_fill(struct sk_buff *
if (tcf_action_dump(skb, actions, bind, ref, false) < 0)
goto out_nlmsg_trim;
+ nla_nest_end(skb, nest);
+
if (extack && extack->_msg &&
nla_put_string(skb, TCA_EXT_WARN_MSG, extack->_msg))
goto out_nlmsg_trim;
- nla_nest_end(skb, nest);
-
nlh->nlmsg_len = skb_tail_pointer(skb) - b;
return skb->len;
Patches currently in stable-queue which might be from liuhangbin@xxxxxxxxx are
queue-6.1/revert-net-sched-act_api-move-tca_ext_warn_msg-to-the-correct-hierarchy.patch
queue-6.1/ipvlan-fix-bound-dev-checking-for-ipv6-l3s-mode.patch
queue-6.1/net-sched-act_api-add-specific-ext_warn_msg-for-tc-action.patch
queue-6.1/sched-add-new-attr-tca_ext_warn_msg-to-report-tc-ext.patch
