brcm2708: Revert "staging: vc04_services: prevent integer overflow in create_pagelist()"
[openwrt/openwrt.git] / target / linux / brcm2708 / patches-4.9 / 950-0100-staging-vchi-Convert-to-current-get_user_pages-argum.patch
1 From ec643be82b145a65d9c78d24eea7470b9bb6e0c4 Mon Sep 17 00:00:00 2001
2 From: Eric Anholt <eric@anholt.net>
3 Date: Mon, 3 Oct 2016 10:14:10 -0700
4 Subject: [PATCH] staging/vchi: Convert to current get_user_pages() arguments.
5
6 Signed-off-by: Eric Anholt <eric@anholt.net>
7 ---
8 drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c | 2 +-
9 drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c | 3 +--
10 2 files changed, 2 insertions(+), 3 deletions(-)
11
12 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
13 +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
14 @@ -426,7 +426,7 @@ create_pagelist(char __user *buf, size_t
15 *need_release = 0; /* do not try and release vmalloc pages */
16 } else {
17 down_read(&task->mm->mmap_sem);
18 - actual_pages = get_user_pages(task, task->mm,
19 + actual_pages = get_user_pages(
20 (unsigned long)buf & ~(PAGE_SIZE - 1),
21 num_pages,
22 (type == PAGELIST_READ) ? FOLL_WRITE : 0,
23 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
24 +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
25 @@ -1492,8 +1492,7 @@ dump_phys_mem(void *virt_addr, uint32_t
26 }
27
28 down_read(&current->mm->mmap_sem);
29 - rc = get_user_pages(current, /* task */
30 - current->mm, /* mm */
31 + rc = get_user_pages(
32 (unsigned long)virt_addr, /* start */
33 num_pages, /* len */
34 0, /* gup_flags */