diff mbox series

[SRU,F:linux-bluefield,v1,1/5] Revert "net/sched: flower: fix fl_change() error recovery path"

Message ID 20230422014706.594733-2-witu@nvidia.com
State New
Headers show
Series revert "Support hardware miss to tc action" | expand

Commit Message

William Tu April 22, 2023, 1:47 a.m. UTC 
This reverts commit 635ef758926c0acdb84cb96cd3b36554b3e7558d.
---
 net/sched/cls_flower.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)
diff mbox series

Patch

diff --git a/net/sched/cls_flower.c b/net/sched/cls_flower.c
index c347861dfcc1..2431456a58cd 100644
--- a/net/sched/cls_flower.c
+++ b/net/sched/cls_flower.c
@@ -1841,9 +1841,8 @@  static int fl_change(struct net *net, struct sk_buff *in_skb,
 		fnew->flags = nla_get_u32(tb[TCA_FLOWER_FLAGS]);
 
 		if (!tc_flags_valid(fnew->flags)) {
-			kfree(fnew);
 			err = -EINVAL;
-			goto errout_tb;
+			goto errout;
 		}
 	}
 
@@ -1868,10 +1867,8 @@  static int fl_change(struct net *net, struct sk_buff *in_skb,
 		}
 		spin_unlock(&tp->lock);
 
-		if (err) {
-			kfree(fnew);
-			goto errout_tb;
-		}
+		if (err)
+			goto errout;
 	}
 	fnew->handle = handle;
 
@@ -1980,6 +1977,7 @@  static int fl_change(struct net *net, struct sk_buff *in_skb,
 	fl_mask_put(head, fnew->mask);
 errout_idr:
 	idr_remove(&head->handle_idr, fnew->handle);
+errout:
 	__fl_put(fnew);
 errout_tb:
 	kfree(tb);