github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-07 22:14:04 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

media: atomisp: Fixed error handling path

Browse Source 
[ Upstream commit 16a5dcf7fb ]

Inside alloc_user_pages() based on flag value either pin_user_pages()
or get_user_pages_fast() will be called. However, these API might fail.

But free_user_pages() called in error handling path doesn't bother
about return value and will try to unpin bo->pgnr pages, which is
incorrect.

Fix this by passing the page_nr to free_user_pages(). If page_nr > 0
pages will be unpinned based on bo->mem_type. This will also take care
of non error handling path.

allocation")

Link: https://lore.kernel.org/linux-media/1601219284-13275-1-git-send-email-jrdr.linux@gmail.com
Fixes: 14a638ab96 ("media: atomisp: use pin_user_pages() for memory
Signed-off-by: Souptick Joarder <jrdr.linux@gmail.com>
Cc: John Hubbard <jhubbard@nvidia.com>
Cc: Ira Weiny <ira.weiny@intel.com>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Souptick Joarder 2020-09-27 17:08:04 +02:00 committed by Greg Kroah-Hartman
parent cc4cc2fb5a
commit 96498fbb7b
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/staging/media/atomisp/pci/hmm/hmm_bo.c
View File

@ -857,16 +857,17 @@ static void free_private_pages(struct hmm_buffer_object *bo,
kfree(bo->page_obj); kfree(bo->page_obj);
} }
static void free_user_pages(struct hmm_buffer_object *bo) static void free_user_pages(struct hmm_buffer_object *bo,
unsigned int page_nr)
{ {
int i; int i;
hmm_mem_stat.usr_size -= bo->pgnr; hmm_mem_stat.usr_size -= bo->pgnr;
if (bo->mem_type == HMM_BO_MEM_TYPE_PFN) { if (bo->mem_type == HMM_BO_MEM_TYPE_PFN) {
unpin_user_pages(bo->pages, bo->pgnr); unpin_user_pages(bo->pages, page_nr);
} else { } else {
for (i = 0; i < bo->pgnr; i++) for (i = 0; i < page_nr; i++)
put_page(bo->pages[i]); put_page(bo->pages[i]);
} }
kfree(bo->pages); kfree(bo->pages);
@ -942,6 +943,8 @@ static int alloc_user_pages(struct hmm_buffer_object *bo,
dev_err(atomisp_dev, dev_err(atomisp_dev,
"get_user_pages err: bo->pgnr = %d, pgnr actually pinned = %d.\n", "get_user_pages err: bo->pgnr = %d, pgnr actually pinned = %d.\n",
bo->pgnr, page_nr); bo->pgnr, page_nr);
if (page_nr < 0)
page_nr = 0;
goto out_of_mem; goto out_of_mem;
} }
@ -954,7 +957,7 @@ static int alloc_user_pages(struct hmm_buffer_object *bo,
out_of_mem: out_of_mem:
free_user_pages(bo); free_user_pages(bo, page_nr);
return -ENOMEM; return -ENOMEM;
} }
@ -1037,7 +1040,7 @@ void hmm_bo_free_pages(struct hmm_buffer_object *bo)
if (bo->type == HMM_BO_PRIVATE) if (bo->type == HMM_BO_PRIVATE)
free_private_pages(bo, &dynamic_pool, &reserved_pool); free_private_pages(bo, &dynamic_pool, &reserved_pool);
else if (bo->type == HMM_BO_USER) else if (bo->type == HMM_BO_USER)
free_user_pages(bo); free_user_pages(bo, bo->pgnr);
else else
dev_err(atomisp_dev, "invalid buffer type.\n"); dev_err(atomisp_dev, "invalid buffer type.\n");
mutex_unlock(&bo->mutex); mutex_unlock(&bo->mutex);