]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
media: venus: hfi: avoid null dereference in deinit
authorLuca Weiss <luca.weiss@fairphone.com>
Fri, 14 Jan 2022 11:02:26 +0000 (11:02 +0000)
committerMauro Carvalho Chehab <mchehab@kernel.org>
Sun, 24 Apr 2022 07:31:10 +0000 (08:31 +0100)
If venus_probe fails at pm_runtime_put_sync the error handling first
calls hfi_destroy and afterwards hfi_core_deinit. As hfi_destroy sets
core->ops to NULL, hfi_core_deinit cannot call the core_deinit function
anymore.

Avoid this null pointer derefence by skipping the call when necessary.

Signed-off-by: Luca Weiss <luca.weiss@fairphone.com>
Signed-off-by: Stanimir Varbanov <stanimir.varbanov@linaro.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
drivers/media/platform/qcom/venus/hfi.c

index 4e2151fb47f089a443dc1a7e612af60eae3fd2cd..1968f09ad177ae5395e4b99b153c5d474bca755c 100644 (file)
@@ -104,6 +104,9 @@ int hfi_core_deinit(struct venus_core *core, bool blocking)
                mutex_lock(&core->lock);
        }
 
+       if (!core->ops)
+               goto unlock;
+
        ret = core->ops->core_deinit(core);
 
        if (!ret)