From a18997770159b9b48a5c20630223e4f9d3e2bdb5 Mon Sep 17 00:00:00 2001 From: Yuri Nudelman Date: Tue, 14 Jun 2022 15:14:20 +0300 Subject: habanalabs: fix NULL dereference on cs timeout Device descriptor is accessed before an assignment Signed-off-by: Yuri Nudelman Reviewed-by: Oded Gabbay Signed-off-by: Oded Gabbay --- drivers/misc/habanalabs/common/command_submission.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'drivers') diff --git a/drivers/misc/habanalabs/common/command_submission.c b/drivers/misc/habanalabs/common/command_submission.c index 72a557b83a7d..c050f38b7091 100644 --- a/drivers/misc/habanalabs/common/command_submission.c +++ b/drivers/misc/habanalabs/common/command_submission.c @@ -812,6 +812,8 @@ static void cs_timedout(struct work_struct *work) return; } + hdev = cs->ctx->hdev; + if (likely(!skip_reset_on_timeout)) { if (hdev->reset_on_lockup) device_reset = true; @@ -822,8 +824,6 @@ static void cs_timedout(struct work_struct *work) cs->timedout = true; } - hdev = cs->ctx->hdev; - /* Save only the first CS timeout parameters */ rc = atomic_cmpxchg(&hdev->last_error.cs_timeout.write_enable, 1, 0); if (rc) { -- cgit v1.2.3