From: Mauro Carvalho Chehab Date: Tue, 26 May 2020 07:45:16 +0000 (+0200) Subject: media: atomisp: hmm_bo: untag user pointers X-Git-Tag: v5.8-rc1~10^2~73 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=576680cd014b5c6fd6d50abd8a43af83b016088f;p=users%2Fwilly%2Flinux.git media: atomisp: hmm_bo: untag user pointers The kernel ABI was extended to allow pass tagged user pointers. Untag the pointers in this function. Fixes: d93445225cd3 ("uaccess: add noop untagged_addr definition") Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/staging/media/atomisp/pci/hmm/hmm_bo.c b/drivers/staging/media/atomisp/pci/hmm/hmm_bo.c index 492b76c29490..6fce8c95be1d 100644 --- a/drivers/staging/media/atomisp/pci/hmm/hmm_bo.c +++ b/drivers/staging/media/atomisp/pci/hmm/hmm_bo.c @@ -997,6 +997,9 @@ static int alloc_user_pages(struct hmm_buffer_object *bo, * Handle frame buffer allocated in other kerenl space driver * and map to user space */ + + userptr = untagged_addr(userptr); + if (vma->vm_flags & (VM_IO | VM_PFNMAP)) { page_nr = get_pfnmap_pages(current, current->mm, (unsigned long)userptr,