From nobody Mon Sep 29 21:09:36 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 67A4FC25B0D for ; Tue, 16 Aug 2022 04:47:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232432AbiHPEr3 (ORCPT ); Tue, 16 Aug 2022 00:47:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57224 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232242AbiHPEoo (ORCPT ); Tue, 16 Aug 2022 00:44:44 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8B31A19233F; Mon, 15 Aug 2022 13:40:38 -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 271AE60F60; Mon, 15 Aug 2022 20:40:38 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id AB0F5C433C1; Mon, 15 Aug 2022 20:40:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1660596037; bh=4j6xLiki7RQu8w3xPjg3bkrLFoXDa/GsticP4t84mxA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iwHRhsuXlWA2gZMnSMTJXUyX+kq9Aujkhrk1XgITagAjjLyKSH+yQqaBtlml193ZE vP6TQoorTGAUo2Mygtnkq8w0j9D0I98snQHGEFz8n9PEFD5RMlhRiGFAVpRtnZvOwX FWiakMwm0lBmHDryKTROg8fRiVveHQDgS7kBPIDs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Liang He , Mark Brown , Sasha Levin Subject: [PATCH 5.19 0953/1157] ASoc: audio-graph-card2: Fix refcount leak bug in __graph_get_type() Date: Mon, 15 Aug 2022 20:05:09 +0200 Message-Id: <20220815180517.721567538@linuxfoundation.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220815180439.416659447@linuxfoundation.org> References: <20220815180439.416659447@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Liang He [ Upstream commit eda26893dabfc6da7a1e1ff5f8628ed9faab3ab9 ] We should call of_node_put() for the reference before its replacement as it returned by of_get_parent() which has increased the refcount. Besides, we should also call of_node_put() before return. Fixes: c8c74939f791 ("ASoC: audio-graph-card2: add Multi CPU/Codec support") Signed-off-by: Liang He Link: https://lore.kernel.org/r/20220713071200.366729-1-windhl@126.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/generic/audio-graph-card2.c | 35 +++++++++++++++++++-------- 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/sound/soc/generic/audio-graph-card2.c b/sound/soc/generic/audi= o-graph-card2.c index 8e0628e6f2a0..5dba7c89007d 100644 --- a/sound/soc/generic/audio-graph-card2.c +++ b/sound/soc/generic/audio-graph-card2.c @@ -229,7 +229,8 @@ enum graph_type { =20 static enum graph_type __graph_get_type(struct device_node *lnk) { - struct device_node *np; + struct device_node *np, *parent_np; + enum graph_type ret; =20 /* * target { @@ -240,19 +241,33 @@ static enum graph_type __graph_get_type(struct device= _node *lnk) * }; */ np =3D of_get_parent(lnk); - if (of_node_name_eq(np, "ports")) - np =3D of_get_parent(np); + if (of_node_name_eq(np, "ports")) { + parent_np =3D of_get_parent(np); + of_node_put(np); + np =3D parent_np; + } =20 - if (of_node_name_eq(np, GRAPH_NODENAME_MULTI)) - return GRAPH_MULTI; + if (of_node_name_eq(np, GRAPH_NODENAME_MULTI)) { + ret =3D GRAPH_MULTI; + goto out_put; + } =20 - if (of_node_name_eq(np, GRAPH_NODENAME_DPCM)) - return GRAPH_DPCM; + if (of_node_name_eq(np, GRAPH_NODENAME_DPCM)) { + ret =3D GRAPH_DPCM; + goto out_put; + } =20 - if (of_node_name_eq(np, GRAPH_NODENAME_C2C)) - return GRAPH_C2C; + if (of_node_name_eq(np, GRAPH_NODENAME_C2C)) { + ret =3D GRAPH_C2C; + goto out_put; + } + + ret =3D GRAPH_NORMAL; + +out_put: + of_node_put(np); + return ret; =20 - return GRAPH_NORMAL; } =20 static enum graph_type graph_get_type(struct asoc_simple_priv *priv, --=20 2.35.1