| From bb0c3f6019fba32483f3c58ca7ed5ae7639fed53 Mon Sep 17 00:00:00 2001 |
| From: Kangjie Lu <kjlu@umn.edu> |
| Date: Fri, 22 Mar 2019 22:51:06 -0400 |
| Subject: media: vpss: fix a potential NULL pointer dereference |
| |
| [ Upstream commit e08f0761234def47961d3252eac09ccedfe4c6a0 ] |
| |
| In case ioremap fails, the fix returns -ENOMEM to avoid NULL |
| pointer dereference. |
| |
| Signed-off-by: Kangjie Lu <kjlu@umn.edu> |
| Acked-by: Lad, Prabhakar <prabhakar.csengg@gmail.com> |
| Reviewed-by: Mukesh Ojha <mojha@codeaurora.org> |
| Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/media/platform/davinci/vpss.c | 5 +++++ |
| 1 file changed, 5 insertions(+) |
| |
| diff --git a/drivers/media/platform/davinci/vpss.c b/drivers/media/platform/davinci/vpss.c |
| index 3f079ac1b080..be91b0c7d20b 100644 |
| --- a/drivers/media/platform/davinci/vpss.c |
| +++ b/drivers/media/platform/davinci/vpss.c |
| @@ -509,6 +509,11 @@ static int __init vpss_init(void) |
| return -EBUSY; |
| |
| oper_cfg.vpss_regs_base2 = ioremap(VPSS_CLK_CTRL, 4); |
| + if (unlikely(!oper_cfg.vpss_regs_base2)) { |
| + release_mem_region(VPSS_CLK_CTRL, 4); |
| + return -ENOMEM; |
| + } |
| + |
| writel(VPSS_CLK_CTRL_VENCCLKEN | |
| VPSS_CLK_CTRL_DACCLKEN, oper_cfg.vpss_regs_base2); |
| |
| -- |
| 2.20.1 |
| |
