Skip to content

Commit

Permalink
media: venus: hfi: avoid null dereference in deinit
Browse files Browse the repository at this point in the history
[ Upstream commit 86594f6 ]

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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
lweiss-fairphone authored and gregkh committed Jun 9, 2022
1 parent e68270a commit 27ad46d
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions drivers/media/platform/qcom/venus/hfi.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 27ad46d

Please sign in to comment.