OSDN Git Service

media: venus: core: Fix a potential NULL pointer dereference in an error handling...
authorChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Thu, 12 Aug 2021 05:14:22 +0000 (07:14 +0200)
committerMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Tue, 30 Nov 2021 11:30:58 +0000 (12:30 +0100)
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>
drivers/media/platform/qcom/venus/core.c

index f5fa818..fd32385 100644 (file)
@@ -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;
 }