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 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 3CA24C433F5 for ; Wed, 16 Mar 2022 11:17:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:List-Subscribe:List-Help: List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date:Subject:Cc:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=5jstzko1vus8lKjSZ0zAARI0BkejlX/wcKrzY/jU1lU=; b=g8wtuIVcyrUGyl tqheXcvlWeY21U9GCruofqqOPfTJZH+tcst6uYNaahMd0B53x2qb3aX3SJ50c/iq0lLgPPNB7yUeK m390VoDXbnU8o7IxWlELurfDY0yPwNbfhU08srL30t2OICI7DUNgs9Swgo9FzpAitbc5AoueOTbwL 0BSdLpLVm8BTrvZr+20ObeuB0RVgL7a8pijRJfbiHq6Y1fhzlHGfc0ufeCYOGB8OsNiJlb3qSOZpu 7DhwyyJHHRZTpUHPkZgLLOrZG5YbBXP2V8NH/cdI9SGTaQkg7i83OpOAchxFyZdSfF8qTL59hkBCt QV/wRD943pI3nodgs+fw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nURd4-00Cb9o-IZ; Wed, 16 Mar 2022 11:15:46 +0000 Received: from mail-pj1-x1034.google.com ([2607:f8b0:4864:20::1034]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nURd1-00Cb9V-Dk for linux-arm-kernel@lists.infradead.org; Wed, 16 Mar 2022 11:15:44 +0000 Received: by mail-pj1-x1034.google.com with SMTP id m22so1917709pja.0 for ; Wed, 16 Mar 2022 04:15:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id; bh=zpi5C9VV7konMRkeAfHk+5WhJ0SH5tbVLPHMmc40AjM=; b=C2CWoCL0Ekn9fRjpQjKpOPVMIMUMUH4Npcw0+/oPcg2aLyuUpYvpAw2dmMqTRUwiSM b+zYOdiV3tuPw0Gfyl+AKftp59xe8UdWWNofXLCyZtOx7uURMvHYlcAeB8yKAneYjKqI fYjiMp+r4Vxzip6CRZd+JVH029JC7ei9MKq3aXE5t+HCCfNQBhvNEZXFvV/wfp3FPJWs bKIlWbir8Q68uJLn+5yO5nxMHTC+DWePTVxlHYBCzmupgsfYsLryvD7UWfSd7CILtx0Z Crzxs7nNVuWLQLQ1FCSjg35uCXMp/uJX+PDG8iXGsPIIJLnv5Up1osKZ48w5qCjNl2oF VNFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=zpi5C9VV7konMRkeAfHk+5WhJ0SH5tbVLPHMmc40AjM=; b=KMsWpm9wi3uBNqbf/0KxfGVQlKoBnOxl+PqsmhKjkDK7n4jT3YwZ20uJ/5aZ7tRClO u9Zm6PdWuumN7b+e+AUgbcsEpW6F8gvd60bAxmEeqmBkHJcUuJDsRRiBJ0aREZBQHmNF lL47A2Eh8FzdcaKy34gsIMhG0irLE/HHoklXQFDYrC6KhGh1GfES+awFvqqSCT6+vEwe HYNyLdt5seTARK/FuZ6nLKSIQBGpzVFAhp1lgMGW1uliCLXldZXvrZYRGb6EMG+3oZnA gB33ex457dXP+12tyhukGnOz3aGWkGkyFX2Fj9f6dhiG+B12VSFsU55GKOJ14xxQr7/s 01MA== X-Gm-Message-State: AOAM5338sw+ktJG9YI3Z4Je2BSG22I0KJwctqK0/2rNrUsMWuPo9UULg z5+XB7QXE3olNS+CYa6h5tY= X-Google-Smtp-Source: ABdhPJwD/HkV28o+VSnvQcF7fVyfofI2bk4qfLidwrOFxEvmYqOHaHPM3R6krfmEk/xw91sIJ45ZPQ== X-Received: by 2002:a17:902:edd5:b0:153:abee:1093 with SMTP id q21-20020a170902edd500b00153abee1093mr5290014plk.77.1647429342185; Wed, 16 Mar 2022 04:15:42 -0700 (PDT) Received: from localhost.localdomain ([159.226.95.43]) by smtp.googlemail.com with ESMTPSA id w3-20020a63af03000000b00381309eb407sm2125704pge.68.2022.03.16.04.15.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Mar 2022 04:15:41 -0700 (PDT) From: Miaoqian Lin To: Codrin Ciubotariu , Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , Nicolas Ferre , Alexandre Belloni , Claudiu Beznea , Richard Genoud , alsa-devel@alsa-project.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: linmq006@gmail.com Subject: [PATCH] ASoC: atmel: Fix error handling in sam9x5_wm8731_driver_probe Date: Wed, 16 Mar 2022 11:15:30 +0000 Message-Id: <20220316111530.4551-1-linmq006@gmail.com> X-Mailer: git-send-email 2.17.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220316_041543_490035_D19E762D X-CRM114-Status: GOOD ( 14.20 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The device_node pointer is returned by of_parse_phandle() with refcount incremented. We should use of_node_put() on it when done. This function only calls of_node_put() in the regular path. And it will cause refcount leak in error path. Fixes: fdbcb3cba54b ("ASoC: atmel: machine driver for at91sam9x5-wm8731 boards") Signed-off-by: Miaoqian Lin --- sound/soc/atmel/sam9x5_wm8731.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/sound/soc/atmel/sam9x5_wm8731.c b/sound/soc/atmel/sam9x5_wm8731.c index 7c45dc4f8c1b..99310e40e7a6 100644 --- a/sound/soc/atmel/sam9x5_wm8731.c +++ b/sound/soc/atmel/sam9x5_wm8731.c @@ -142,7 +142,7 @@ static int sam9x5_wm8731_driver_probe(struct platform_device *pdev) if (!cpu_np) { dev_err(&pdev->dev, "atmel,ssc-controller node missing\n"); ret = -EINVAL; - goto out; + goto out_put_codec_np; } dai->cpus->of_node = cpu_np; dai->platforms->of_node = cpu_np; @@ -153,12 +153,9 @@ static int sam9x5_wm8731_driver_probe(struct platform_device *pdev) if (ret != 0) { dev_err(&pdev->dev, "Failed to set SSC %d for audio: %d\n", ret, priv->ssc_id); - goto out; + goto out_put_cpu_np; } - of_node_put(codec_np); - of_node_put(cpu_np); - ret = devm_snd_soc_register_card(&pdev->dev, card); if (ret) { dev_err(&pdev->dev, "Platform device allocation failed\n"); @@ -167,10 +164,14 @@ static int sam9x5_wm8731_driver_probe(struct platform_device *pdev) dev_dbg(&pdev->dev, "%s ok\n", __func__); - return ret; + goto out_put_cpu_np; out_put_audio: atmel_ssc_put_audio(priv->ssc_id); +out_put_cpu_np: + of_node_put(cpu_np); +out_put_codec_np: + of_node_put(codec_np); out: return ret; } -- 2.17.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel