Skip to contentSkip to conversation

net/sched: cls_u32: Fix reference counter leak leading to overflow

PATCH Applied Lee Jones 4 participants 6 messages Jun 8, 2023 – Jun 9, 2023

Subsystems (3)
lore
Share & tools
lore

Lee Jones

author
#0 lore raw

PATCH v2 1/1 net/sched: cls_u32: Fix reference counter leak leading to overflow

In the event of a failure in tcf_change_indev(), u32_set_parms() will immediately return without decrementing the recently incremented reference counter. If this happens enough times, the counter will rollover and the reference freed, leading to a double free which can be used to do 'bad things'.

In order to prevent this, move the point of possible failure above the point where the reference counter is incremented. Also save any meaningful return values to be applied to the return data at the appropriate point in time.

This issue was caught with KASAN.

Fixes 705c7091262d ("net: sched: cls_u32: no need to call tcf_exts_change for newly allocated struct")

---
v1 -> v2:
- Instead of decrementing the refcnt in the error path, move the point of failure up above the section which increments it.

net/sched/cls_u32.c | 18 ++++++++++--------

 1 file changed, 10 insertions(+), 8 deletions(-)
net/sched/cls_u32.c +10 -8
index 4e2e269f121f8..d15d50de79802 100644
@@ -718,13 +718,19 @@ static int u32_set_parms(struct net *net, struct tcf_proto *tp,
 			 struct nlattr *est, u32 flags, u32 fl_flags,
 			 struct netlink_ext_ack *extack)
 {
-	int err;
+	int err, ifindex = -1;
 
 	err = tcf_exts_validate_ex(net, tp, tb, est, &n->exts, flags,
 				   fl_flags, extack);
 	if (err < 0)
 		return err;
 
+	if (tb[TCA_U32_INDEV]) {
+		ifindex = tcf_change_indev(net, tb[TCA_U32_INDEV], extack);
+		if (ifindex < 0)
+			return -EINVAL;
+	}
+
 	if (tb[TCA_U32_LINK]) {
 		u32 handle = nla_get_u32(tb[TCA_U32_LINK]);
 		struct tc_u_hnode *ht_down = NULL, *ht_old;
@@ -759,13 +765,9 @@ static int u32_set_parms(struct net *net, struct tcf_proto *tp,
 		tcf_bind_filter(tp, &n->res, base);
 	}
 
-	if (tb[TCA_U32_INDEV]) {
-		int ret;
-		ret = tcf_change_indev(net, tb[TCA_U32_INDEV], extack);
-		if (ret < 0)
-			return -EINVAL;
-		n->ifindex = ret;
-	}
+	if (ifindex >= 0)
+		n->ifindex = ifindex;
+
 	return 0;
 }
 
Signature · 1 line
2.41.0.rc0.172.g3f132b7071-goog
Reviewed-by on v2 1/1
#1 lore raw
Quoted 12 lines · Lee Jones

In the event of a failure in tcf_change_indev(), u32_set_parms() will immediately return without decrementing the recently incremented reference counter. If this happens enough times, the counter will rollover and the reference freed, leading to a double free which can be used to do 'bad things'.

In order to prevent this, move the point of possible failure above the point where the reference counter is incremented. Also save any meaningful return values to be applied to the return data at the appropriate point in time.

Quoted 6 lines

This issue was caught with KASAN.

Fixes 705c7091262d ("net: sched: cls_u32: no need to call tcf_exts_change for newly allocated struct")

---

Thanks Lee !

author
#2 lore raw
Quoted 13 lines · Eric Dumazet
Quoted 12 lines · Lee Jones

In the event of a failure in tcf_change_indev(), u32_set_parms() will immediately return without decrementing the recently incremented reference counter. If this happens enough times, the counter will rollover and the reference freed, leading to a double free which can be used to do 'bad things'.

In order to prevent this, move the point of possible failure above the point where the reference counter is incremented. Also save any meaningful return values to be applied to the return data at the appropriate point in time.

Quoted 8 lines
Quoted 6 lines

This issue was caught with KASAN.

Fixes 705c7091262d ("net: sched: cls_u32: no need to call tcf_exts_change for newly allocated struct")

---

Thanks Lee !

No problem. Thanks for your help.

Quoted 1 line
Signature · 1 line
Lee Jones [李琼斯]
maintainer Acked-by
#3 lore raw
Quoted 18 lines · Lee Jones
Quoted 15 lines · Eric Dumazet
Quoted 14 lines · Lee Jones

In the event of a failure in tcf_change_indev(), u32_set_parms() will immediately return without decrementing the recently incremented reference counter. If this happens enough times, the counter will rollover and the reference freed, leading to a double free which can be used to do 'bad things'.

In order to prevent this, move the point of possible failure above the point where the reference counter is incremented. Also save any meaningful return values to be applied to the return data at the appropriate point in time.

This issue was caught with KASAN.

Quoted 10 lines
Quoted 6 lines
Quoted 4 lines
Fixes 705c7091262d ("net: sched: cls_u32: no need to call tcf_exts_change for newly allocated struct")

---

Thanks Lee !

No problem. Thanks for your help.

Quoted 1 line

cheers,
jamal

Quoted 2 lines

--
Lee Jones [李琼斯]

author
#4 lore raw
Quoted 24 lines · Jamal Hadi Salim
Quoted 23 lines · Lee Jones
Quoted 20 lines · Eric Dumazet
Quoted 18 lines · Lee Jones

In the event of a failure in tcf_change_indev(), u32_set_parms() will immediately return without decrementing the recently incremented reference counter. If this happens enough times, the counter will rollover and the reference freed, leading to a double free which can be used to do 'bad things'.

In order to prevent this, move the point of possible failure above the point where the reference counter is incremented. Also save any meaningful return values to be applied to the return data at the appropriate point in time.

This issue was caught with KASAN.

Fixes 705c7091262d ("net: sched: cls_u32: no need to call tcf_exts_change for newly allocated struct")

---

Quoted 7 lines
Quoted 5 lines
Quoted 1 line

Thanks Lee !

No problem. Thanks for your help.

Quoted 1 line

Thanks Jamal.

Signature · 1 line
Lee Jones [李琼斯]
#5 lore raw
In reply to Lee Jones
This patch was applied to netdev/net.git (main) by David S. Miller <[email protected]>:

Hello:

This patch was applied to netdev/net.git (main)
by David S. Miller <[email protected]>:

Quoted 6 lines · On Thu, 8 Jun 2023 08:29:03 +0100 you wrote:

In the event of a failure in tcf_change_indev(), u32_set_parms() will immediately return without decrementing the recently incremented reference counter. If this happens enough times, the counter will rollover and the reference freed, leading to a double free which can be used to do 'bad things'.

Quoted 6 lines

In order to prevent this, move the point of possible failure above the point where the reference counter is incremented. Also save any meaningful return values to be applied to the return data at the appropriate point in time.

[...]

Here is the summary with links:
- [v2,1/1] net/sched: cls_u32: Fix reference counter leak leading to overflow

    https://git.kernel.org/netdev/net/c/04c55383fa56

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html