leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

habanalabs: fix memory leak with CBs with unaligned size

Browse Source 
This patch fix a bug when a command buffer with unaligned size (with
regard to PAGE_SIZE) was used. The accounting for the unmap operation
wasn't done correctly and could result in a memory leak.

Signed-off-by: Oded Gabbay <oded.gabbay@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Oded Gabbay 2019-02-28 10:46:19 +02:00 committed by Greg Kroah-Hartman
parent df3a8875b5
commit 9e28c17641
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/misc/habanalabs/command_buffer.c
View File

@ -236,11 +236,14 @@ int hl_cb_ioctl(struct hl_fpriv *hpriv, void *data)
static void cb_vm_close(struct vm_area_struct *vma) static void cb_vm_close(struct vm_area_struct *vma)
{ {
struct hl_cb *cb = (struct hl_cb *) vma->vm_private_data; struct hl_cb *cb = (struct hl_cb *) vma->vm_private_data;
long new_mmap_size;
cb->mmap_size -= vma->vm_end - vma->vm_start; new_mmap_size = cb->mmap_size - (vma->vm_end - vma->vm_start);
if (cb->mmap_size) if (new_mmap_size > 0) {
cb->mmap_size = new_mmap_size;
return; return;
}
spin_lock(&cb->lock); spin_lock(&cb->lock);
cb->mmap = false; cb->mmap = false;
@ -273,7 +276,7 @@ int hl_cb_mmap(struct hl_fpriv *hpriv, struct vm_area_struct *vma)
} }
/* Validation check */ /* Validation check */
if ((vma->vm_end - vma->vm_start) != cb->size) { if ((vma->vm_end - vma->vm_start) != ALIGN(cb->size, PAGE_SIZE)) {
dev_err(hdev->dev, dev_err(hdev->dev,
"CB mmap failed, mmap size 0x%lx != 0x%x cb size\n", "CB mmap failed, mmap size 0x%lx != 0x%x cb size\n",
vma->vm_end - vma->vm_start, cb->size); vma->vm_end - vma->vm_start, cb->size);