Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 24eee1e4 authored by jie@chenjie6@huwei.com's avatar jie@chenjie6@huwei.com Committed by Linus Torvalds
Browse files

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: default avatarchen jie <chenjie6@huawei.com>
Reviewed-by: default avatarAndrew 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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 3ca17b1f

mm/memory.c

+3 −0
Original line number Diff line number Diff line
@@ -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