]> git.baikalelectronics.ru Git - kernel.git/commitdiff
habanalabs: add validity check for cq counter offset
authorfarah kassabri <fkassabri@habana.ai>
Mon, 13 Jun 2022 13:22:20 +0000 (16:22 +0300)
committerOded Gabbay <ogabbay@kernel.org>
Tue, 12 Jul 2022 06:09:23 +0000 (09:09 +0300)
Driver performs no validity check for the user cq counter offset
used in both wait_for_interrupt and register_for_timestamp APIs.

Signed-off-by: farah kassabri <fkassabri@habana.ai>
Reviewed-by: Oded Gabbay <ogabbay@kernel.org>
Signed-off-by: Oded Gabbay <ogabbay@kernel.org>
drivers/misc/habanalabs/common/command_submission.c

index cbb7c29966ff50c7eab1fedc2342b679f1cf885b..72a557b83a7dd95e36d5d12fc49ab35829671743 100644 (file)
@@ -2979,7 +2979,7 @@ static int ts_buff_get_kernel_ts_record(struct hl_mmap_mem_buf *buf,
        u64 current_cq_counter;
 
        /* Validate ts_offset not exceeding last max */
-       if (requested_offset_record > cb_last) {
+       if (requested_offset_record >= cb_last) {
                dev_err(buf->mmg->dev, "Ts offset exceeds max CB offset(0x%llx)\n",
                                                                (u64)(uintptr_t)cb_last);
                return -EINVAL;
@@ -3064,6 +3064,13 @@ static int _hl_interrupt_wait_ioctl(struct hl_device *hdev, struct hl_ctx *ctx,
                goto put_ctx;
        }
 
+       /* Validate the cq offset */
+       if (((u64 *) cq_cb->kernel_address + cq_counters_offset) >=
+                       ((u64 *) cq_cb->kernel_address + (cq_cb->size / sizeof(u64)))) {
+               rc = -EINVAL;
+               goto put_cq_cb;
+       }
+
        if (register_ts_record) {
                dev_dbg(hdev->dev, "Timestamp registration: interrupt id: %u, ts offset: %llu, cq_offset: %llu\n",
                                        interrupt->interrupt_id, ts_offset, cq_counters_offset);