Commit e0e7089b authored by Johan Hovold's avatar Johan Hovold Committed by Georgi Djakov

interconnect: fix icc_provider_del() error handling

The interconnect framework currently expects that providers are only
removed when there are no users and after all nodes have been removed.

There is currently nothing that guarantees this to be the case and the
framework does not do any reference counting, but refusing to remove the
provider is never correct as that would leave a dangling pointer to a
resource that is about to be released in the global provider list (e.g.
accessible through debugfs).

Replace the current sanity checks with WARN_ON() so that the provider is
always removed.

Fixes: 11f1ceca ("interconnect: Add generic on-chip interconnect API")
Cc: stable@vger.kernel.org      # 5.1: 680f8666: interconnect: Make icc_provider_del() return void
Reviewed-by: default avatarKonrad Dybcio <konrad.dybcio@linaro.org>
Signed-off-by: default avatarJohan Hovold <johan+linaro@kernel.org>
Tested-by: Luca Ceresoli <luca.ceresoli@bootlin.com> # i.MX8MP MSC SM2-MB-EP1 Board
Link: https://lore.kernel.org/r/20230306075651.2449-3-johan+linaro@kernel.orgSigned-off-by: default avatarGeorgi Djakov <djakov@kernel.org>
parent a5904f41
...@@ -1065,18 +1065,8 @@ EXPORT_SYMBOL_GPL(icc_provider_add); ...@@ -1065,18 +1065,8 @@ EXPORT_SYMBOL_GPL(icc_provider_add);
void icc_provider_del(struct icc_provider *provider) void icc_provider_del(struct icc_provider *provider)
{ {
mutex_lock(&icc_lock); mutex_lock(&icc_lock);
if (provider->users) { WARN_ON(provider->users);
pr_warn("interconnect provider still has %d users\n", WARN_ON(!list_empty(&provider->nodes));
provider->users);
mutex_unlock(&icc_lock);
return;
}
if (!list_empty(&provider->nodes)) {
pr_warn("interconnect provider still has nodes\n");
mutex_unlock(&icc_lock);
return;
}
list_del(&provider->provider_list); list_del(&provider->provider_list);
mutex_unlock(&icc_lock); mutex_unlock(&icc_lock);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment