linux-kernel - Re: [PATCH -next] clocksource/drivers/qcom: add missing iounmap() on error in msm_dt_timer

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20210409063205.GC4376@work>
Date:   Fri, 9 Apr 2021 12:02:05 +0530
From:   Manivannan Sadhasivam <manivannan.sadhasivam@...aro.org>
To:     Yang Yingliang <yangyingliang@...wei.com>
Cc:     linux-kernel@...r.kernel.org, linux-arm-msm@...r.kernel.org,
        agross@...nel.org, bjorn.andersson@...aro.org,
        daniel.lezcano@...aro.org
Subject: Re: [PATCH -next] clocksource/drivers/qcom: add missing iounmap() on
 error in msm_dt_timer_init()

On Fri, Apr 09, 2021 at 12:56:57PM +0800, Yang Yingliang wrote:
> base and cpu0_base are not unmapped on error path, add the missing
> iounmap() before return msm_dt_timer_init() in the error handling
> cases.
> 
> Fixes: 6e3321631ac2 ("ARM: msm: Add DT support to msm_timer")
> Reported-by: Hulk Robot <hulkci@...wei.com>
> Signed-off-by: Yang Yingliang <yangyingliang@...wei.com>
> ---
>  drivers/clocksource/timer-qcom.c | 23 ++++++++++++++++++-----
>  1 file changed, 18 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/clocksource/timer-qcom.c b/drivers/clocksource/timer-qcom.c
> index b4afe3a67583..3488876198e0 100644
> --- a/drivers/clocksource/timer-qcom.c
> +++ b/drivers/clocksource/timer-qcom.c
> @@ -213,7 +213,8 @@ static int __init msm_dt_timer_init(struct device_node *np)
>  	irq = irq_of_parse_and_map(np, 1);
>  	if (irq <= 0) {
>  		pr_err("Can't get irq\n");
> -		return -EINVAL;
> +		ret = -EINVAL;
> +		goto err_unmap_base;
>  	}
>  
>  	/* We use CPU0's DGT for the clocksource */
> @@ -223,18 +224,19 @@ static int __init msm_dt_timer_init(struct device_node *np)
>  	ret = of_address_to_resource(np, 0, &res);
>  	if (ret) {
>  		pr_err("Failed to parse DGT resource\n");
> -		return ret;
> +		goto err_unmap_base;
>  	}
>  
>  	cpu0_base = ioremap(res.start + percpu_offset, resource_size(&res));
>  	if (!cpu0_base) {
>  		pr_err("Failed to map source base\n");
> -		return -EINVAL;

Missing "ret = -EINVAL" assignment. With that fixed,

Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@...aro.org>

Thanks,
Mani

> +		goto err_unmap_base;
>  	}
>  
>  	if (of_property_read_u32(np, "clock-frequency", &freq)) {
>  		pr_err("Unknown frequency\n");
> -		return -EINVAL;
> +		ret = -EINVAL;
> +		goto err_unmap_cpu0_base;
>  	}
>  
>  	event_base = base + 0x4;
> @@ -243,7 +245,18 @@ static int __init msm_dt_timer_init(struct device_node *np)
>  	freq /= 4;
>  	writel_relaxed(DGT_CLK_CTL_DIV_4, source_base + DGT_CLK_CTL);
>  
> -	return msm_timer_init(freq, 32, irq, !!percpu_offset);
> +	ret = msm_timer_init(freq, 32, irq, !!percpu_offset);
> +	if (ret)
> +		goto err_unmap_cpu0_base;
> +
> +	return 0;
> +
> +err_unmap_cpu0_base:
> +	iounmap(cpu0_base);
> +err_unmap_base:
> +	iounmap(base);
> +
> +	return ret;
>  }
>  TIMER_OF_DECLARE(kpss_timer, "qcom,kpss-timer", msm_dt_timer_init);
>  TIMER_OF_DECLARE(scss_timer, "qcom,scss-timer", msm_dt_timer_init);
> -- 
> 2.25.1
>