| Message ID | 20230712211313.545268-4-victor@mojatatu.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | net: sched: Fixes for classifiers | expand |
On Wed, Jul 12, 2023 at 06:13:11PM -0300, Victor Nogueira wrote: > In the case of an update, when TCA_U32_LINK is set, u32_set_parms will > decrement the refcount of the ht_down (struct tc_u_hnode) pointer > present in the older u32 filter which we are replacing. However, if > u32_replace_hw_knode errors out, the update command fails and that > ht_down pointer continues decremented. To fix that, when > u32_replace_hw_knode fails, check if ht_down's refcount was decremented > and undo the decrement. > > Fixes: d34e3e181395 ("net: cls_u32: Add support for skip-sw flag to tc u32 classifier.") > Signed-off-by: Victor Nogueira <victor@mojatatu.com> > Acked-by: Jamal Hadi Salim <jhs@mojatatu.com> > Reviewed-by: Pedro Tammela <pctammela@mojatatu.com> Reviewed-by: Simon Horman <simon.horman@corigine.com>
diff --git a/net/sched/cls_u32.c b/net/sched/cls_u32.c index ed358466d042..5abf31e432ca 100644 --- a/net/sched/cls_u32.c +++ b/net/sched/cls_u32.c @@ -928,6 +928,13 @@ static int u32_change(struct net *net, struct sk_buff *in_skb, if (err) { u32_unbind_filter(tp, new, tb); + if (tb[TCA_U32_LINK]) { + struct tc_u_hnode *ht_old; + + ht_old = rtnl_dereference(n->ht_down); + if (ht_old) + ht_old->refcnt++; + } __u32_destroy_key(new); return err; }
In the case of an update, when TCA_U32_LINK is set, u32_set_parms will decrement the refcount of the ht_down (struct tc_u_hnode) pointer present in the older u32 filter which we are replacing. However, if u32_replace_hw_knode errors out, the update command fails and that ht_down pointer continues decremented. To fix that, when u32_replace_hw_knode fails, check if ht_down's refcount was decremented and undo the decrement. Fixes: d34e3e181395 ("net: cls_u32: Add support for skip-sw flag to tc u32 classifier.") Signed-off-by: Victor Nogueira <victor@mojatatu.com> Acked-by: Jamal Hadi Salim <jhs@mojatatu.com> Reviewed-by: Pedro Tammela <pctammela@mojatatu.com> --- net/sched/cls_u32.c | 7 +++++++ 1 file changed, 7 insertions(+)