Skip to content

Commit c61611f

Browse files
mstsirkintorvalds
authored andcommitted
get_user_pages_fast(): return -EFAULT on access_ok failure
get_user_pages_fast is supposed to be a faster drop-in equivalent of get_user_pages. As such, callers expect it to return a negative return code when passed an invalid address, and never expect it to return 0 when passed a positive number of pages, since its documentation says: * Returns number of pages pinned. This may be fewer than the number * requested. If nr_pages is 0 or negative, returns 0. If no pages * were pinned, returns -errno. When get_user_pages_fast fall back on get_user_pages this is exactly what happens. Unfortunately the implementation is inconsistent: it returns 0 if passed a kernel address, confusing callers: for example, the following is pretty common but does not appear to do the right thing with a kernel address: ret = get_user_pages_fast(addr, 1, writeable, &page); if (ret < 0) return ret; Change get_user_pages_fast to return -EFAULT when supplied a kernel address to make it match expectations. All callers have been audited for consistency with the documented semantics. Link: http://lkml.kernel.org/r/[email protected] Fixes: 5b65c46 ("mm, x86/mm: Fix performance regression in get_user_pages_fast()") Signed-off-by: Michael S. Tsirkin <[email protected]> Reported-by: [email protected] Reviewed-by: Andrew Morton <[email protected]> Cc: Kirill A. Shutemov <[email protected]> Cc: Huang Ying <[email protected]> Cc: Jonathan Corbet <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Thomas Gleixner <[email protected]> Cc: Thorsten Leemhuis <[email protected]> Cc: <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent 09e35a4 commit c61611f

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

mm/gup.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1806,9 +1806,12 @@ int get_user_pages_fast(unsigned long start, int nr_pages, int write,
18061806
len = (unsigned long) nr_pages << PAGE_SHIFT;
18071807
end = start + len;
18081808

1809+
if (nr_pages <= 0)
1810+
return 0;
1811+
18091812
if (unlikely(!access_ok(write ? VERIFY_WRITE : VERIFY_READ,
18101813
(void __user *)start, len)))
1811-
return 0;
1814+
return -EFAULT;
18121815

18131816
if (gup_fast_permitted(start, nr_pages, write)) {
18141817
local_irq_disable();

0 commit comments

Comments
 (0)