Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/tegra: Fix reference leak when pm_runtime_get_sync() fails

The PM reference count is not expected to be incremented on return in
these Tegra functions.

However, pm_runtime_get_sync() will increment the PM reference count
even on failure. Forgetting to put the reference again will result in
a leak.

Replace it with pm_runtime_resume_and_get() to keep the usage counter
balanced.

Fixes: fd67e9c6ed5a ("drm/tegra: Do not implement runtime PM")
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Qinglang Miao <miaoqinglang@huawei.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>

authored by

Qinglang Miao and committed by
Thierry Reding
dcdfe271 3ef170c2

+6 -6
+1 -1
drivers/gpu/drm/tegra/dc.c
··· 2186 2186 struct device *dev = client->dev; 2187 2187 int err; 2188 2188 2189 - err = pm_runtime_get_sync(dev); 2189 + err = pm_runtime_resume_and_get(dev); 2190 2190 if (err < 0) { 2191 2191 dev_err(dev, "failed to get runtime PM: %d\n", err); 2192 2192 return err;
+1 -1
drivers/gpu/drm/tegra/dsi.c
··· 1111 1111 struct device *dev = client->dev; 1112 1112 int err; 1113 1113 1114 - err = pm_runtime_get_sync(dev); 1114 + err = pm_runtime_resume_and_get(dev); 1115 1115 if (err < 0) { 1116 1116 dev_err(dev, "failed to get runtime PM: %d\n", err); 1117 1117 return err;
+1 -1
drivers/gpu/drm/tegra/hdmi.c
··· 1510 1510 struct device *dev = client->dev; 1511 1511 int err; 1512 1512 1513 - err = pm_runtime_get_sync(dev); 1513 + err = pm_runtime_resume_and_get(dev); 1514 1514 if (err < 0) { 1515 1515 dev_err(dev, "failed to get runtime PM: %d\n", err); 1516 1516 return err;
+1 -1
drivers/gpu/drm/tegra/hub.c
··· 789 789 unsigned int i; 790 790 int err; 791 791 792 - err = pm_runtime_get_sync(dev); 792 + err = pm_runtime_resume_and_get(dev); 793 793 if (err < 0) { 794 794 dev_err(dev, "failed to get runtime PM: %d\n", err); 795 795 return err;
+1 -1
drivers/gpu/drm/tegra/sor.c
··· 3218 3218 struct device *dev = client->dev; 3219 3219 int err; 3220 3220 3221 - err = pm_runtime_get_sync(dev); 3221 + err = pm_runtime_resume_and_get(dev); 3222 3222 if (err < 0) { 3223 3223 dev_err(dev, "failed to get runtime PM: %d\n", err); 3224 3224 return err;
+1 -1
drivers/gpu/drm/tegra/vic.c
··· 331 331 struct vic *vic = to_vic(client); 332 332 int err; 333 333 334 - err = pm_runtime_get_sync(vic->dev); 334 + err = pm_runtime_resume_and_get(vic->dev); 335 335 if (err < 0) 336 336 return err; 337 337