iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

habanalabs: avoid returning a valid handle if map_block() fails

Browse Source 
map_block() sets the block id handle even if get_hw_block_id() fails,
and in this case it uses block id 0 which might be a valid id.
Modify it to set the handle only if get_hw_block_id() succeeds.

Signed-off-by: Tomer Tayar <ttayar@habana.ai>
Reviewed-by: Oded Gabbay <ogabbay@kernel.org>
Signed-off-by: Oded Gabbay <ogabbay@kernel.org>
This commit is contained in:
Tomer Tayar 2022-07-27 09:04:13 +03:00 committed by Oded Gabbay
parent 0c876b47a5
commit 7fa6c0fe8b
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/misc/habanalabs/common/memory.c
View File

@ -1418,18 +1418,23 @@ vm_type_err:
return rc; return rc;
} }
static int map_block(struct hl_device *hdev, u64 address, u64 *handle, static int map_block(struct hl_device *hdev, u64 address, u64 *handle, u32 *size)
u32 *size)
{ {
u32 block_id = 0; u32 block_id;
int rc; int rc;
*handle = 0;
if (size)
*size = 0;
rc = hdev->asic_funcs->get_hw_block_id(hdev, address, size, &block_id); rc = hdev->asic_funcs->get_hw_block_id(hdev, address, size, &block_id);
if (rc)
return rc;
*handle = block_id | HL_MMAP_TYPE_BLOCK; *handle = block_id | HL_MMAP_TYPE_BLOCK;
*handle <<= PAGE_SHIFT; *handle <<= PAGE_SHIFT;
return rc; return 0;
} }
static void hw_block_vm_close(struct vm_area_struct *vma) static void hw_block_vm_close(struct vm_area_struct *vma)