lkml.org 
[lkml]   [2018]   [Sep]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 048/107] mm/memory.c: check return value of ioremap_prot
    Date
    4.9-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: "jie@chenjie6@huwei.com" <jie@chenjie6@huwei.com>

    [ Upstream commit 24eee1e4c47977bdfb71d6f15f6011e7b6188d04 ]

    ioremap_prot() can return NULL which could lead to an oops.

    Link: http://lkml.kernel.org/r/1533195441-58594-1-git-send-email-chenjie6@huawei.com
    Signed-off-by: chen jie <chenjie6@huawei.com>
    Reviewed-by: Andrew Morton <akpm@linux-foundation.org>
    Cc: Li Zefan <lizefan@huawei.com>
    Cc: chenjie <chenjie6@huawei.com>
    Cc: Yang Shi <shy828301@gmail.com>
    Cc: Alexey Dobriyan <adobriyan@gmail.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    mm/memory.c | 3 +++
    1 file changed, 3 insertions(+)

    --- a/mm/memory.c
    +++ b/mm/memory.c
    @@ -3861,6 +3861,9 @@ int generic_access_phys(struct vm_area_s
    return -EINVAL;

    maddr = ioremap_prot(phys_addr, PAGE_ALIGN(len + offset), prot);
    + if (!maddr)
    + return -ENOMEM;
    +
    if (write)
    memcpy_toio(maddr + offset, buf, len);
    else

    \
     
     \ /
      Last update: 2018-09-03 19:06    [W:3.572 / U:0.088 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site