summaryrefslogtreecommitdiffstats
path: root/mm/memory.c
diff options
context:
space:
mode:
authorjie@chenjie6@huwei.com <jie@chenjie6@huwei.com>2018-08-11 02:23:06 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2018-08-11 05:19:58 +0200
commit24eee1e4c47977bdfb71d6f15f6011e7b6188d04 (patch)
treebb2ab1880fdbaf2f3351470eabe98bf2b7acaf64 /mm/memory.c
parentlib/ubsan: remove null-pointer checks (diff)
downloadlinux-24eee1e4c47977bdfb71d6f15f6011e7b6188d04.tar.xz
linux-24eee1e4c47977bdfb71d6f15f6011e7b6188d04.zip
mm/memory.c: check return value of ioremap_prot
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>
Diffstat (limited to 'mm/memory.c')
-rw-r--r--mm/memory.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/mm/memory.c b/mm/memory.c
index dab1511294ad..c5e87a3a82ba 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -4395,6 +4395,9 @@ int generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
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