From: Luca Weiss Date: Fri, 14 Jan 2022 11:02:26 +0000 (+0000) Subject: media: venus: hfi: avoid null dereference in deinit X-Git-Tag: howlett/maple/20220722_2~486^2~230 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=86594f6af867b5165d2ba7b5a71fae3a5961e56c;p=users%2Fjedix%2Flinux-maple.git media: venus: hfi: avoid null dereference in deinit 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 Signed-off-by: Stanimir Varbanov Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/platform/qcom/venus/hfi.c b/drivers/media/platform/qcom/venus/hfi.c index 4e2151fb47f0..1968f09ad177 100644 --- a/drivers/media/platform/qcom/venus/hfi.c +++ b/drivers/media/platform/qcom/venus/hfi.c @@ -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)