Skip to contentSkip to conversation

clk: fix possible use after free

PATCH RESEND Applied Nuno Sá 3 participants 6 messages Jul 10, 2024 – Aug 12, 2024 Common clk

lore
Share & tools
lore

Nuno Sá

author
#0 lore raw

cover clk: fix possible use after free

The first patch is fixing a possible use after free in case a clk provider is removed before it's consumer (more details on the commit message.

The second patch is a straightforward replacement of the open coded

hlist_del(&clk->clks_node) -> clk_core_unlink_consumer(clk)

---
Nuno Sá (2):
clk: fix clk not being unlinked from consumers list
clk: use clk_core_unlink_consumer() helper

 drivers/clk/clk.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

---
base-commit: 5029c56be4bab3bce7db6d9595b0bbd171a5b154
change-id: 20240611-dev-clk-misc-a9e401b25032 --

Thanks!
- Nuno Sá

author
#1 lore raw

PATCH RESEND 1/2 clk: fix clk not being unlinked from consumers list

When a clk_hw is registered we add a struct clk handle to it's consumers list. This handle is created in '__clk_register()' per the 'alloc_clk()' call.

As such, we need to remove this handle when unregistering the clk_hw. This can actually lead to a use after free if a provider gets removed before a consumer. When removing the consumer, '__clk_put()' is called and that will do 'hlist_del(&clk->clks_node)' which will touch in already freed memory.

Fixes 1df4046a93e0 ("clk: Combine __clk_get() and __clk_create_clk()")
---
 drivers/clk/clk.c | 2 ++
 1 file changed, 2 insertions(+)
drivers/clk/clk.c +2 -0
index 8cca52be993f..b11beeca7e55 100644
@@ -4606,6 +4606,8 @@ void clk_unregister(struct clk *clk)
 	if (clk->core->protect_count)
 		pr_warn("%s: unregistering protected clock: %s\n",
 					__func__, clk->core->name);
+
+	clk_core_unlink_consumer(clk);
 	clk_prepare_unlock();
 
 	kref_put(&clk->core->ref, __clk_release);
Signature · 1 line
2.45.2
author
#2 lore raw

PATCH RESEND 2/2 clk: use clk_core_unlink_consumer() helper

In reply to Nuno Sá

There is an helper to remove a consumer from the clk provider list. Hence, let's use it when releasing a consumer.

---
 drivers/clk/clk.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/clk.c +1 -1
index b11beeca7e55..ed0731a4b773 100644
@@ -4764,7 +4764,7 @@ void __clk_put(struct clk *clk)
 		clk->exclusive_count = 0;
 	}
 
-	hlist_del(&clk->clks_node);
+	clk_core_unlink_consumer(clk);
 
 	/* If we had any boundaries on that clock, let's drop them. */
 	if (clk->min_rate > 0 || clk->max_rate < ULONG_MAX)
Signature · 1 line
2.45.2
maintainer Applied
#3 lore raw

Re: [PATCH RESEND (again) 2/2] clk: use clk_core_unlink_consumer() helper

Quoting Nuno Sá (2024-07-10 01:40:36)

Quoted 5 lines

There is an helper to remove a consumer from the clk provider list. Hence, let's use it when releasing a consumer.

---

Applied to clk-next

#4 lore raw

Re: [PATCH RESEND (again) 2/2] clk: use clk_core_unlink_consumer() helper

Quoted 8 lines · Stephen Boyd

Quoting Nuno Sá (2024-07-10 01:40:36)

Quoted 5 lines

There is an helper to remove a consumer from the clk provider list. Hence, let's use it when releasing a consumer.

---

Applied to clk-next

Hi Stephen,

I realized only this one was applied and not the first patch. Could you please tell me why it's not being accepted or if I should do it somehow differently? Or it just needs better look at?

- Nuno Sá

maintainer
#5 lore raw

Re: [PATCH RESEND (again) 2/2] clk: use clk_core_unlink_consumer() helper

Quoting Nuno Sá (2024-08-11 22:22:54)

Quoted 8 lines · Stephen Boyd
Quoted 7 lines

Quoting Nuno Sá (2024-07-10 01:40:36)

Quoted 5 lines

There is an helper to remove a consumer from the clk provider list. Hence, let's use it when releasing a consumer.

---

Quoted 8 lines
Quoted 1 line

Applied to clk-next

Hi Stephen,

I realized only this one was applied and not the first patch. Could you please tell me why it's not being accepted or if I should do it somehow differently? Or it just needs better look at?

I will re-send the first patch in a day or so. I wrote a pile of KUnit tests for it.