Merge 5.16-rc8 into char-misc-next

[linux-2.6-microblaze.git] / drivers / virt / nitro_enclaves / ne_misc_dev.c

diff --git a/drivers/virt/nitro_enclaves/ne_misc_dev.c b/drivers/virt/nitro_enclaves/ne_misc_dev.c
index 51ba4ca..20c881b 100644 (file)
--- a/drivers/virt/nitro_enclaves/ne_misc_dev.c
+++ b/drivers/virt/nitro_enclaves/ne_misc_dev.c
@@ -963,8 +963,9 @@ static int ne_set_user_memory_region_ioctl(struct ne_enclave *ne_enclave,
                        goto put_pages;
                }
 
-               gup_rc = get_user_pages(mem_region.userspace_addr + memory_size, 1, FOLL_GET,
-                                       ne_mem_region->pages + i, NULL);
+               gup_rc = get_user_pages_unlocked(mem_region.userspace_addr + memory_size, 1,
+                                                ne_mem_region->pages + i, FOLL_GET);
+
                if (gup_rc < 0) {
                        rc = gup_rc;