lkml.org 
[lkml]   [2019]   [Aug]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v3 21/41] fsl_hypervisor: convert put_page() to put_user_page*()
    Date
    From: John Hubbard <jhubbard@nvidia.com>

    For pages that were retained via get_user_pages*(), release those pages
    via the new put_user_page*() routines, instead of via put_page() or
    release_pages().

    This is part a tree-wide conversion, as described in commit fc1d8e7cca2d
    ("mm: introduce put_user_page*(), placeholder versions").

    This changes the release code slightly, because each page slot in the
    page_list[] array is no longer checked for NULL. However, that check
    was wrong anyway, because the get_user_pages() pattern of usage here
    never allowed for NULL entries within a range of pinned pages.

    Cc: Al Viro <viro@zeniv.linux.org.uk>
    Cc: Kees Cook <keescook@chromium.org>
    Cc: Rob Herring <robh@kernel.org>
    Signed-off-by: John Hubbard <jhubbard@nvidia.com>
    ---
    drivers/virt/fsl_hypervisor.c | 7 ++-----
    1 file changed, 2 insertions(+), 5 deletions(-)

    diff --git a/drivers/virt/fsl_hypervisor.c b/drivers/virt/fsl_hypervisor.c
    index 93d5bebf9572..a8f78d572c45 100644
    --- a/drivers/virt/fsl_hypervisor.c
    +++ b/drivers/virt/fsl_hypervisor.c
    @@ -292,11 +292,8 @@ static long ioctl_memcpy(struct fsl_hv_ioctl_memcpy __user *p)
    virt_to_phys(sg_list), num_pages);

    exit:
    - if (pages) {
    - for (i = 0; i < num_pages; i++)
    - if (pages[i])
    - put_page(pages[i]);
    - }
    + if (pages)
    + put_user_pages(pages, num_pages);

    kfree(sg_list_unaligned);
    kfree(pages);
    --
    2.22.0
    \
     
     \ /
      Last update: 2019-08-07 03:56    [W:3.417 / U:0.144 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site