4.9-stable review patch.  If anyone has any objections, please let me know.

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

From: "jie@chenj...@huwei.com" <jie@chenj...@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-chenj...@huawei.com
Signed-off-by: chen jie <chenj...@huawei.com>
Reviewed-by: Andrew Morton <a...@linux-foundation.org>
Cc: Li Zefan <lize...@huawei.com>
Cc: chenjie <chenj...@huawei.com>
Cc: Yang Shi <shy828...@gmail.com>
Cc: Alexey Dobriyan <adobri...@gmail.com>
Signed-off-by: Andrew Morton <a...@linux-foundation.org>
Signed-off-by: Linus Torvalds <torva...@linux-foundation.org>
Signed-off-by: Sasha Levin <alexander.le...@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gre...@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


Reply via email to