]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
accel/amdxdna: Fix locally exploitable BUG_ON in amdxdna_insert_pages()
authorLizhi Hou <lizhi.hou@amd.com>
Fri, 31 Jul 2026 18:59:55 +0000 (11:59 -0700)
committerLizhi Hou <lizhi.hou@amd.com>
Sat, 1 Aug 2026 05:40:29 +0000 (22:40 -0700)
In amdxdna_insert_pages(), vm_flags_mod() sets VM_MIXEDMAP and clears
VM_PFNMAP. If an unprivileged userspace process mmaps a non-imported GEM
object and then calls madvise(MADV_DONTNEED), the PTEs will be
successfully cleared because VM_MIXEDMAP allows this (unlike VM_PFNMAP).

When userspace subsequently accesses the memory, drm_gem_shmem_fault()
handles the page fault and attempts to map the backing shmem page via
vmf_insert_pfn() which calls vmf_insert_pfn_prot(). Because the backing
shmem page is normal system memory (pfn_valid(pfn) is true) and the VMA
now has VM_MIXEDMAP set, won't this predictably trigger the explicit
assertion BUG_ON((vma->vm_flags & VM_MIXEDMAP) && pfn_valid(pfn))

Fix by removing the vm_flags_mod() call and replacing the vm_insert_pages()
pre-population with the handle_mm_fault() loop that was already used for
the import (dma-buf) path.

Fixes: e486147c912f ("accel/amdxdna: Add BO import and export")
Reviewed-by: Max Zhen <max.zhen@amd.com>
Signed-off-by: Lizhi Hou <lizhi.hou@amd.com>
Link: https://patch.msgid.link/20260731185955.3449311-1-lizhi.hou@amd.com
drivers/accel/amdxdna/amdxdna_gem.c

index aec69d5f463e62248960e271d0e9e1ea4539961b..1c63eff0a4a85541c9c0a08927bd3e28d2d35823 100644 (file)
@@ -467,25 +467,17 @@ static int amdxdna_insert_pages(struct amdxdna_gem_obj *abo,
                        XDNA_ERR(xdna, "Failed shmem mmap %d", ret);
                        return ret;
                }
-
-               /* The buffer is based on memory pages. Fix the flag. */
-               vm_flags_mod(vma, VM_MIXEDMAP, VM_PFNMAP);
-               ret = vm_insert_pages(vma, vma->vm_start, abo->base.pages,
-                                     &num_pages);
+       } else {
+               vma->vm_private_data = NULL;
+               vma->vm_ops = NULL;
+               ret = dma_buf_mmap(abo->dma_buf, vma, 0);
                if (ret) {
-                       XDNA_ERR(xdna, "Failed insert pages %d", ret);
-                       amdxdna_mark_mapp_invalid(abo, vma);
+                       XDNA_ERR(xdna, "Failed to mmap dma buf %d", ret);
+                       return ret;
                }
 
-               return 0;
-       }
-
-       vma->vm_private_data = NULL;
-       vma->vm_ops = NULL;
-       ret = dma_buf_mmap(abo->dma_buf, vma, 0);
-       if (ret) {
-               XDNA_ERR(xdna, "Failed to mmap dma buf %d", ret);
-               return ret;
+               /* Drop the reference drm_gem_mmap_obj() acquired.*/
+               drm_gem_object_put(to_gobj(abo));
        }
 
        do {
@@ -502,9 +494,6 @@ static int amdxdna_insert_pages(struct amdxdna_gem_obj *abo,
                offset += PAGE_SIZE;
        } while (--num_pages);
 
-       /* Drop the reference drm_gem_mmap_obj() acquired.*/
-       drm_gem_object_put(to_gobj(abo));
-
        return 0;
 }