diff options
| author |   Christophe JAILLET <christophe.jaillet@wanadoo.fr> | 2021-08-12 07:14:22 +0200 |
|---|---|---|
| committer |   Mauro Carvalho Chehab <mchehab+huawei@kernel.org> | 2021-11-30 12:30:58 +0100 |
| commit | e4debea9be7d5db52bc6a565a4c02c3c6560d093 (patch) | |
| tree | 5f2ef61e325b7e74426bf06c876d2edad1291acd /drivers/media/platform/qcom/venus | |
| parent | media: venus: avoid calling core_clk_setrate() concurrently during concurrent video sessions (diff) | |
| download | linux-dev-e4debea9be7d5db52bc6a565a4c02c3c6560d093.tar.xz linux-dev-e4debea9be7d5db52bc6a565a4c02c3c6560d093.zip | |
media: venus: core: Fix a potential NULL pointer dereference in an error handling path
The normal path of the function makes the assumption that
'pm_ops->core_power' may be NULL.
We should make the same assumption in the error handling path or a NULL
pointer dereference may occur.
Add the missing test before calling 'pm_ops->core_power'
Fixes: 9e8efdb57879 ("media: venus: core: vote for video-mem path")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: Stanimir Varbanov <stanimir.varbanov@linaro.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Diffstat (limited to 'drivers/media/platform/qcom/venus')
| -rw-r--r-- | drivers/media/platform/qcom/venus/core.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/platform/qcom/venus/core.c b/drivers/media/platform/qcom/venus/core.c index f5fa81896012..fd32385485fa 100644 --- a/drivers/media/platform/qcom/venus/core.c +++ b/drivers/media/platform/qcom/venus/core.c @@ -473,7 +473,8 @@ static __maybe_unused int venus_runtime_suspend(struct device *dev) err_video_path: icc_set_bw(core->cpucfg_path, kbps_to_icc(1000), 0); err_cpucfg_path: - pm_ops->core_power(core, POWER_ON); + if (pm_ops->core_power) + pm_ops->core_power(core, POWER_ON); return ret; } |