From patchwork Mon Oct 24 11:30:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 8491 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp403807wru; Mon, 24 Oct 2022 04:53:25 -0700 (PDT) X-Google-Smtp-Source: AMsMyM65eKGtaWqmzWXKyYB8f4AQyZZm5lyV1jrntLDj6Ukkf9WULXaWgdwM1PLXI9ghDLfh3hK1 X-Received: by 2002:a17:902:bd45:b0:186:9efb:71fe with SMTP id b5-20020a170902bd4500b001869efb71femr7229905plx.128.1666612405693; Mon, 24 Oct 2022 04:53:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666612405; cv=none; d=google.com; s=arc-20160816; b=kz0Sd9bv6YeOwJihb9139/nCUsHhPsYjQlq1khX3k9JZhuJO6RfeY15O7seqnqu50W SF7CgaRfC87PWMBr6qjRiUMYMXepuISopfGy/Wo76lKI/Akli0SzGOprPF22wh2ZnoWx TT4SD3mbAQkdw2Klu5ZrHxxeR+QtD+KEF0Ht0yJDuMWTGWRitI3bLsO2SvGgchI+QT1Y gJ1tNa//uUwq3zikIHI89baysDJVaNzmqGUujB0TNScITOf/MAzveS/AsEn63VwqganQ bKIWseXF6mYKNP5hwZUdjL5GArFTsQcK2PpXQfbgGyahAr/wYEDZQfammnQetEwkgjzq tj1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=K4+VndfIWmggfbtbdKj/IiplDjs0HJZUmty7SKKJxJI=; b=P5kHBj7GFQjy+PFqLrQI/DtYXr710u1CP5HdTX5znTQtBXcSXp7d1JXlALnEaok3u7 XMN7nnoZz9rXurk8m+sFOHXxD9AetgMnKWCA5r5vJNgWG3cT1WDtlFzcoaiIR/X2ieo8 cvH35SH1dRs+iMkZlFENaEGBs6kENRn01YP/Zg/0Sc6Qtrd5CNMNa/FoSarjnR6CiNHa A8ncuiJy6KmxD37AQQG51BggMbC4PVL2MGCDVC258DjTY/E5OSozseJ95DbzoykZFaNQ TkFKqfAS470js2NLEOQC8AkZfEJFegzepHxDe09NJD/b4GzcXYO7a/3HbtkbLtjSF7ZV a4mA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=i3cI1W+8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id n5-20020aa79845000000b0053bafb8e916si32672820pfq.162.2022.10.24.04.53.13; Mon, 24 Oct 2022 04:53:25 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=i3cI1W+8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231969AbiJXLw7 (ORCPT + 99 others); Mon, 24 Oct 2022 07:52:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36148 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231922AbiJXLwO (ORCPT ); Mon, 24 Oct 2022 07:52:14 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1EB8C193CC; Mon, 24 Oct 2022 04:44:41 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 06D6461254; Mon, 24 Oct 2022 11:43:07 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1A4C6C433C1; Mon, 24 Oct 2022 11:43:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666611786; bh=+Ub/dlT9bc0ho4n4CTPaoj1vtKAy4tRTp1Z1r8ySh94=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=i3cI1W+8+MacI7D8XIHvCV6w/IPmcuOy6YqbV2sSA7/w8Uwq/mw6Nw8Dk1c2rsTin jp2OpRk2a9L11Wzl/Qha0QSDBSMkzHV7dNddP1co6fAWQPF6gqpMA078hFokVipIfu RDmplrV3DuEk7Vm3+XvfciwHRfyU7aLXx1exifL4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Liang He , Bjorn Andersson , Sasha Levin Subject: [PATCH 4.9 083/159] soc: qcom: smsm: Fix refcount leak bugs in qcom_smsm_probe() Date: Mon, 24 Oct 2022 13:30:37 +0200 Message-Id: <20221024112952.448915558@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024112949.358278806@linuxfoundation.org> References: <20221024112949.358278806@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747569769921239929?= X-GMAIL-MSGID: =?utf-8?q?1747569769921239929?= From: Liang He [ Upstream commit af8f6f39b8afd772fda4f8e61823ef8c021bf382 ] There are two refcount leak bugs in qcom_smsm_probe(): (1) The 'local_node' is escaped out from for_each_child_of_node() as the break of iteration, we should call of_node_put() for it in error path or when it is not used anymore. (2) The 'node' is escaped out from for_each_available_child_of_node() as the 'goto', we should call of_node_put() for it in goto target. Fixes: c97c4090ff72 ("soc: qcom: smsm: Add driver for Qualcomm SMSM") Signed-off-by: Liang He Signed-off-by: Bjorn Andersson Link: https://lore.kernel.org/r/20220721135217.1301039-1-windhl@126.com Signed-off-by: Sasha Levin --- drivers/soc/qcom/smsm.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/drivers/soc/qcom/smsm.c b/drivers/soc/qcom/smsm.c index 01bc8528f24d..87ab37807e3f 100644 --- a/drivers/soc/qcom/smsm.c +++ b/drivers/soc/qcom/smsm.c @@ -515,7 +515,7 @@ static int qcom_smsm_probe(struct platform_device *pdev) for (id = 0; id < smsm->num_hosts; id++) { ret = smsm_parse_ipc(smsm, id); if (ret < 0) - return ret; + goto out_put; } /* Acquire the main SMSM state vector */ @@ -523,13 +523,14 @@ static int qcom_smsm_probe(struct platform_device *pdev) smsm->num_entries * sizeof(u32)); if (ret < 0 && ret != -EEXIST) { dev_err(&pdev->dev, "unable to allocate shared state entry\n"); - return ret; + goto out_put; } states = qcom_smem_get(QCOM_SMEM_HOST_ANY, SMEM_SMSM_SHARED_STATE, NULL); if (IS_ERR(states)) { dev_err(&pdev->dev, "Unable to acquire shared state entry\n"); - return PTR_ERR(states); + ret = PTR_ERR(states); + goto out_put; } /* Acquire the list of interrupt mask vectors */ @@ -537,13 +538,14 @@ static int qcom_smsm_probe(struct platform_device *pdev) ret = qcom_smem_alloc(QCOM_SMEM_HOST_ANY, SMEM_SMSM_CPU_INTR_MASK, size); if (ret < 0 && ret != -EEXIST) { dev_err(&pdev->dev, "unable to allocate smsm interrupt mask\n"); - return ret; + goto out_put; } intr_mask = qcom_smem_get(QCOM_SMEM_HOST_ANY, SMEM_SMSM_CPU_INTR_MASK, NULL); if (IS_ERR(intr_mask)) { dev_err(&pdev->dev, "unable to acquire shared memory interrupt mask\n"); - return PTR_ERR(intr_mask); + ret = PTR_ERR(intr_mask); + goto out_put; } /* Setup the reference to the local state bits */ @@ -554,7 +556,8 @@ static int qcom_smsm_probe(struct platform_device *pdev) smsm->state = qcom_smem_state_register(local_node, &smsm_state_ops, smsm); if (IS_ERR(smsm->state)) { dev_err(smsm->dev, "failed to register qcom_smem_state\n"); - return PTR_ERR(smsm->state); + ret = PTR_ERR(smsm->state); + goto out_put; } /* Register handlers for remote processor entries of interest. */ @@ -584,16 +587,19 @@ static int qcom_smsm_probe(struct platform_device *pdev) } platform_set_drvdata(pdev, smsm); + of_node_put(local_node); return 0; unwind_interfaces: + of_node_put(node); for (id = 0; id < smsm->num_entries; id++) if (smsm->entries[id].domain) irq_domain_remove(smsm->entries[id].domain); qcom_smem_state_unregister(smsm->state); - +out_put: + of_node_put(local_node); return ret; }