diff mbox series

[SRU,Focal,v2,4/6] net: sched: remove unused tcf_result extension

Message ID 20230512180139.27507-7-yuxuan.luo@canonical.com
State New
Headers show
Series [SRU,Focal,v2,1/6] net: sched: extract qstats update code into functions | expand

Commit Message

Yuxuan Luo May 12, 2023, 6:01 p.m. UTC 
From: Jamal Hadi Salim <jhs@mojatatu.com>

Added by:
commit e5cf1baf92cb ("act_mirred: use TC_ACT_REINSERT when possible")
but no longer useful.

Signed-off-by: Jamal Hadi Salim <jhs@mojatatu.com>
Link: https://lore.kernel.org/r/20220919130627.3551233-1-jhs@mojatatu.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
(cherry picked from commit 1d14b30b5a5e52da93467af7c1dca08f124186df)
CVE-2022-4269
Signed-off-by: Yuxuan Luo <yuxuan.luo@canonical.com>
---
 include/net/sch_generic.h | 5 -----
 net/sched/act_mirred.c    | 3 +--
 2 files changed, 1 insertion(+), 7 deletions(-)
diff mbox series

Patch

diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h
index 7bb9c964dbda1..1c38c5b954bd9 100644
--- a/include/net/sch_generic.h
+++ b/include/net/sch_generic.h
@@ -310,11 +310,6 @@  struct tcf_result {
 		};
 		const struct tcf_proto *goto_tp;
 
-		/* used in the skb_tc_reinsert function */
-		struct {
-			bool		ingress;
-			struct gnet_stats_queue *qstats;
-		};
 	};
 };
 
diff --git a/net/sched/act_mirred.c b/net/sched/act_mirred.c
index 50ee2dbb8b1a6..a523a67268178 100644
--- a/net/sched/act_mirred.c
+++ b/net/sched/act_mirred.c
@@ -306,8 +306,7 @@  static int tcf_mirred_act(struct sk_buff *skb, const struct tc_action *a,
 
 		/* let's the caller reinsert the packet, if possible */
 		if (use_reinsert) {
-			res->ingress = want_ingress;
-			err = tcf_mirred_forward(res->ingress, skb);
+			err = tcf_mirred_forward(want_ingress, skb);
 			if (err)
 				tcf_action_inc_overlimit_qstats(&m->common);
 			__this_cpu_dec(mirred_rec_level);