lkml.org 
[lkml]   [2021]   [Oct]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 5/5] habanalabs: fix NULL pointer dereference
Date
From: Dani Liberman <dliberman@habana.ai>

When polling fences for multi CS, it is possible that fence is
no longer exists (its corresponding CS completed and the fence was
deleted) but we still accessing its parameters, causing NULL pointer
dereference.

Fixed by checking if fence exits before accessing its parameters.

Signed-off-by: Dani Liberman <dliberman@habana.ai>
Reviewed-by: Oded Gabbay <ogabbay@kernel.org>
Signed-off-by: Oded Gabbay <ogabbay@kernel.org>
---
drivers/misc/habanalabs/common/command_submission.c | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/drivers/misc/habanalabs/common/command_submission.c b/drivers/misc/habanalabs/common/command_submission.c
index 8e4dc1441fff..a3358cc3c877 100644
--- a/drivers/misc/habanalabs/common/command_submission.c
+++ b/drivers/misc/habanalabs/common/command_submission.c
@@ -2382,7 +2382,15 @@ static int hl_cs_poll_fences(struct multi_cs_data *mcs_data)
break;
}

- mcs_data->stream_master_qid_map |= fence->stream_master_qid_map;
+ /*
+ * It is possible to get an old sequence numbers from user
+ * which related to already completed CSs and their fences
+ * already gone. In this case, no need to consider its QID for
+ * mcs completion.
+ */
+ if (fence)
+ mcs_data->stream_master_qid_map |=
+ fence->stream_master_qid_map;

/*
* Using mcs_handling_done to avoid possibility of mcs_data
@@ -2390,7 +2398,8 @@ static int hl_cs_poll_fences(struct multi_cs_data *mcs_data)
* all of its mcs handling, to avoid race the next time the
* user waits for mcs.
*/
- if (status == CS_WAIT_STATUS_BUSY || !fence->mcs_handling_done)
+ if (status == CS_WAIT_STATUS_BUSY ||
+ (fence && !fence->mcs_handling_done))
continue;

mcs_data->completion_bitmap |= BIT(i);
--
2.25.1
\
 
 \ /
  Last update: 2021-10-10 10:05    [W:0.066 / U:0.060 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site