2019-03-09 06:56:22

by Kangjie Lu

Subject: [PATCH] media: vpss: fix a potential NULL pointer dereference

In case ioremap fails, the fix returns -ENOMEM to avoid NULL
pointer dereference.

Signed-off-by: Kangjie Lu <[email protected]>
---
drivers/media/platform/davinci/vpss.c | 3 +++
1 file changed, 3 insertions(+)

diff --git a/drivers/media/platform/davinci/vpss.c b/drivers/media/platform/davinci/vpss.c
index 19cf6853411e..f7beed2de9cb 100644
--- a/drivers/media/platform/davinci/vpss.c
+++ b/drivers/media/platform/davinci/vpss.c
@@ -518,6 +518,9 @@ 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))
+ return -ENOMEM;
+
writel(VPSS_CLK_CTRL_VENCCLKEN |
VPSS_CLK_CTRL_DACCLKEN, oper_cfg.vpss_regs_base2);

--
2.17.1

2019-03-27 13:34:13

by Mukesh Ojha

Subject: Re: [PATCH] media: vpss: fix a potential NULL pointer dereference

On 3/9/2019 12:23 PM, Kangjie Lu wrote:
> In case ioremap fails, the fix returns -ENOMEM to avoid NULL
> pointer dereference.
>
> Signed-off-by: Kangjie Lu <[email protected]>

Reviewed-by: Mukesh Ojha <[email protected]>

-Mukesh


> ---
> drivers/media/platform/davinci/vpss.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/drivers/media/platform/davinci/vpss.c b/drivers/media/platform/davinci/vpss.c
> index 19cf6853411e..f7beed2de9cb 100644
> --- a/drivers/media/platform/davinci/vpss.c
> +++ b/drivers/media/platform/davinci/vpss.c
> @@ -518,6 +518,9 @@ 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))
> + return -ENOMEM;
> +
> writel(VPSS_CLK_CTRL_VENCCLKEN |
> VPSS_CLK_CTRL_DACCLKEN, oper_cfg.vpss_regs_base2);
>