|
 |
49dc51 |
From c03072dea1c0fc5d66e48692cd8be13443327a29 Mon Sep 17 00:00:00 2001
|
|
|
49dc51 |
From: Jamal Hadi Salim <jhs@mojatatu.com>
|
|
|
49dc51 |
Date: Sun, 1 Jan 2023 16:57:43 -0500
|
|
|
49dc51 |
Subject: [PATCH 2/2] net: sched: atm: dont intepret cls results when asked to
|
|
|
49dc51 |
drop
|
|
|
49dc51 |
Git-commit: a2965c7be0522eaa18808684b7b82b248515511b
|
|
|
e59590 |
References: bsc#1207125 CVE-2023-23455
|
|
|
49dc51 |
Patch-mainline: v6.2-rc3
|
|
|
49dc51 |
|
|
|
49dc51 |
If asked to drop a packet via TC_ACT_SHOT it is unsafe to assume
|
|
|
49dc51 |
res.class contains a valid pointer
|
|
|
49dc51 |
Fixes: b0188d4dbe5f ("[NET_SCHED]: sch_atm: Lindent")
|
|
|
49dc51 |
|
|
|
49dc51 |
Signed-off-by: Jamal Hadi Salim <jhs@mojatatu.com>
|
|
|
49dc51 |
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
|
49dc51 |
Signed-off-by: Denis Kirjanov <denis.kirjanov@suse.com>
|
|
|
49dc51 |
---
|
|
|
49dc51 |
net/sched/sch_atm.c | 5 ++++-
|
|
|
49dc51 |
1 file changed, 4 insertions(+), 1 deletion(-)
|
|
|
49dc51 |
|
|
|
49dc51 |
diff --git a/net/sched/sch_atm.c b/net/sched/sch_atm.c
|
|
|
49dc51 |
index 6385995dc700..34dd0434d99d 100644
|
|
|
49dc51 |
--- a/net/sched/sch_atm.c
|
|
|
49dc51 |
+++ b/net/sched/sch_atm.c
|
|
|
49dc51 |
@@ -396,10 +396,13 @@ static int atm_tc_enqueue(struct sk_buff *skb, struct Qdisc *sch,
|
|
|
49dc51 |
result = tcf_classify(skb, fl, &res, true);
|
|
|
49dc51 |
if (result < 0)
|
|
|
49dc51 |
continue;
|
|
|
49dc51 |
+ if (result == TC_ACT_SHOT)
|
|
|
49dc51 |
+ goto done;
|
|
|
49dc51 |
+
|
|
|
49dc51 |
flow = (struct atm_flow_data *)res.class;
|
|
|
49dc51 |
if (!flow)
|
|
|
49dc51 |
flow = lookup_flow(sch, res.classid);
|
|
|
49dc51 |
- goto done;
|
|
|
49dc51 |
+ goto drop;
|
|
|
49dc51 |
}
|
|
|
49dc51 |
}
|
|
|
49dc51 |
flow = NULL;
|
|
|
49dc51 |
--
|
|
|
49dc51 |
2.16.4
|
|
|
49dc51 |
|