android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PM: domains: Move the verification of in-params from genpd_add_device()

Browse Source 
[ Upstream commit 4384a70c8813e8573d1841fd94eee873f80a7e1a ]

Commit f38d1a6d00 ("PM: domains: Allocate governor data dynamically
based on a genpd governor") started to use the in-parameters in
genpd_add_device(), without first doing a verification of them.

This isn't really a big problem, as most callers do a verification already.

Therefore, let's drop the verification from genpd_add_device() and make
sure all the callers take care of it instead.

Reported-by: Dan Carpenter <dan.carpenter@linaro.org>
Fixes: f38d1a6d00 ("PM: domains: Allocate governor data dynamically based on a genpd governor")
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Ulf Hansson 2023-05-30 11:55:36 +02:00 committed by Greg Kroah-Hartman
parent f1f5248ced
commit 3f9e54eb38
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/base/power/domain.c
View File

@ -1624,9 +1624,6 @@ static int genpd_add_device(struct generic_pm_domain *genpd, struct device *dev,
dev_dbg(dev, "%s()\n", __func__); dev_dbg(dev, "%s()\n", __func__);
if (IS_ERR_OR_NULL(genpd) || IS_ERR_OR_NULL(dev))
return -EINVAL;
gpd_data = genpd_alloc_dev_data(dev, gd); gpd_data = genpd_alloc_dev_data(dev, gd);
if (IS_ERR(gpd_data)) if (IS_ERR(gpd_data))
return PTR_ERR(gpd_data); return PTR_ERR(gpd_data);
@ -1668,6 +1665,9 @@ int pm_genpd_add_device(struct generic_pm_domain *genpd, struct device *dev)
{ {
int ret; int ret;
if (!genpd || !dev)
return -EINVAL;
mutex_lock(&gpd_list_lock); mutex_lock(&gpd_list_lock);
ret = genpd_add_device(genpd, dev, dev); ret = genpd_add_device(genpd, dev, dev);
mutex_unlock(&gpd_list_lock); mutex_unlock(&gpd_list_lock);
@ -2514,6 +2514,9 @@ int of_genpd_add_device(struct of_phandle_args *genpdspec, struct device *dev)
struct generic_pm_domain *genpd; struct generic_pm_domain *genpd;
int ret; int ret;
if (!dev)
return -EINVAL;
mutex_lock(&gpd_list_lock); mutex_lock(&gpd_list_lock);
genpd = genpd_get_from_provider(genpdspec); genpd = genpd_get_from_provider(genpdspec);