From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.2 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7F06CC433ED for ; Fri, 9 Apr 2021 06:32:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5E09461181 for ; Fri, 9 Apr 2021 06:32:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233439AbhDIGcX (ORCPT ); Fri, 9 Apr 2021 02:32:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36146 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233434AbhDIGcW (ORCPT ); Fri, 9 Apr 2021 02:32:22 -0400 Received: from mail-pj1-x1030.google.com (mail-pj1-x1030.google.com [IPv6:2607:f8b0:4864:20::1030]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 451F1C061762 for ; Thu, 8 Apr 2021 23:32:10 -0700 (PDT) Received: by mail-pj1-x1030.google.com with SMTP id z22-20020a17090a0156b029014d4056663fso2688325pje.0 for ; Thu, 08 Apr 2021 23:32:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=28/bcnH/X+FO3xScorwIPxjziJdMECQ4SflmNRtuhf4=; b=nnobsVWbu3INJH0G3qQfwEkWoUf9+e7bCTJcA3kHFGiLT6KMMyjWn1PC4z/qRpW3E1 pE2mVB0gQVKgQiX4CRqADVcHiV0C3O0jZYtBAAcoa+5mVaNZUMHVowdc2Zw3VOtTpvIR TpSDYDnVwuLfGZCBAgItXh9NhOdQce0R/9noZYoS+G3G57HmsLEKOUkTyCLZu6fRWQFY 4W8XXWXKpqEyu1hG9/h9l82iE9AP0OZ7iGTsKNNjEucCuH543u3EkOioqWy+uF2Eoqah yrZYYi7H1+zyis1a7lx3hsz8/4mBt87WjW22mXIV+4bu5pQQqXQgpyAFf/hm+CVTMZtd 0EHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=28/bcnH/X+FO3xScorwIPxjziJdMECQ4SflmNRtuhf4=; b=h/Ve0wDGgxuMK4UA/EUGPDGBfdygu7i8y3PD0yzqKDQLrTbq20Hl/04O4JI0prVKfW W3txuu7D5r89MxZCd+Lezd43oQ0IqMesXcMQqG7v1D2Lv397qjKkTOiau3blZPq2FCtm CfEyY9kIyVMoRT1IS/8PAuEmVe3kobpz1aflfgIBltwW6cjje5xqY3qtkkVdZ4aR7+lE Dn/Awanl0o31kKRCqoooFIUYMLYSHjokS3k4iJukHGqyYPgD75arzgUjO+PGN4iWdx0y xJH+ULFAOs08J+WOLox9xNaVr6ta+J9AmOs2+/8FqP4zbyzXcDiWqQJGPWYI65571xux S2Dg== X-Gm-Message-State: AOAM532wrkpJunB2DS0QBmRIjqUSJC+WPn+lHSBE1JxC+hFD7+7WBoPi cWP+Uo+MFteAV99U83VVU/uR X-Google-Smtp-Source: ABdhPJzix94dGzGY3LxNVQhxzpy7L+sEbK4QOpLOA2Sfv46f0OsksuItNs6U/pFtB8lnPmwOd5v03g== X-Received: by 2002:a17:902:c643:b029:e7:3c10:4695 with SMTP id s3-20020a170902c643b02900e73c104695mr11511308pls.41.1617949929607; Thu, 08 Apr 2021 23:32:09 -0700 (PDT) Received: from work ([103.77.37.131]) by smtp.gmail.com with ESMTPSA id g26sm1359647pge.67.2021.04.08.23.32.07 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 08 Apr 2021 23:32:08 -0700 (PDT) Date: Fri, 9 Apr 2021 12:02:05 +0530 From: Manivannan Sadhasivam To: Yang Yingliang Cc: linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, agross@kernel.org, bjorn.andersson@linaro.org, daniel.lezcano@linaro.org Subject: Re: [PATCH -next] clocksource/drivers/qcom: add missing iounmap() on error in msm_dt_timer_init() Message-ID: <20210409063205.GC4376@work> References: <20210409045657.666888-1-yangyingliang@huawei.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210409045657.666888-1-yangyingliang@huawei.com> User-Agent: Mutt/1.9.4 (2018-02-28) Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org 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 > Signed-off-by: Yang Yingliang > --- > 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 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 >