lkml.org 
[lkml]   [2019]   [Aug]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 34/34] fs/binfmt_elf: convert put_page() to put_user_page*()
    Date
    From: Ira Weiny <ira.weiny@intel.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").

    get_dump_page calls get_user_page so put_user_page must be used
    to match.

    Signed-off-by: Ira Weiny <ira.weiny@intel.com>
    Signed-off-by: John Hubbard <jhubbard@nvidia.com>
    ---
    fs/binfmt_elf.c | 2 +-
    fs/binfmt_elf_fdpic.c | 2 +-
    2 files changed, 2 insertions(+), 2 deletions(-)

    diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
    index d4e11b2e04f6..92e4a5ca99d8 100644
    --- a/fs/binfmt_elf.c
    +++ b/fs/binfmt_elf.c
    @@ -2377,7 +2377,7 @@ static int elf_core_dump(struct coredump_params *cprm)
    void *kaddr = kmap(page);
    stop = !dump_emit(cprm, kaddr, PAGE_SIZE);
    kunmap(page);
    - put_page(page);
    + put_user_page(page);
    } else
    stop = !dump_skip(cprm, PAGE_SIZE);
    if (stop)
    diff --git a/fs/binfmt_elf_fdpic.c b/fs/binfmt_elf_fdpic.c
    index d86ebd0dcc3d..321724b3be22 100644
    --- a/fs/binfmt_elf_fdpic.c
    +++ b/fs/binfmt_elf_fdpic.c
    @@ -1511,7 +1511,7 @@ static bool elf_fdpic_dump_segments(struct coredump_params *cprm)
    void *kaddr = kmap(page);
    res = dump_emit(cprm, kaddr, PAGE_SIZE);
    kunmap(page);
    - put_page(page);
    + put_user_page(page);
    } else {
    res = dump_skip(cprm, PAGE_SIZE);
    }
    --
    2.22.0
    \
     
     \ /
      Last update: 2019-08-05 00:58    [W:4.056 / U:0.060 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site