From patchwork Tue Mar 8 01:39:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miaoqian Lin X-Patchwork-Id: 12772864 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 9BC3FC433F5 for ; Tue, 8 Mar 2022 01:41:37 +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:References:In-Reply-To: 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: List-Owner; bh=dPoP4j3GM4N9HfpxsJ5YCkibmiVfogjI7BKSnVn/zFU=; b=N7q5ejws1F+zTa 8n/5hcw61dD3131vvQ9kyAfpBROMOmkwl76kSaVwPApi9KlsSzahI0Z5n11Mfm3ZppCgalf+LRNOZ k1dd5zMWJ9Lt8l4Yo7Cp+TlehJBHKhE8uY7yWEK0sci12jBxd1r75NkjIfjqtkqMLEdpyL2FJlB4U FhOO6B3sR6uwVYZTt+8e+CEEaaCqSYpctkJWCy0bS3twGV+Yp69noS3JDHVybuc++c6BFsFjEj/iv cQ/iZhiO3aXSsBgwwpcRud9WDLH9QsMNPBYUeMAwYr1j5Gx3a8VlXndNRnDCB5UiYQ9A/PUENZh6P KfivXRPircuYHbTtDhfg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nROpy-002LoG-0V; Tue, 08 Mar 2022 01:40:30 +0000 Received: from mail-pj1-x1035.google.com ([2607:f8b0:4864:20::1035]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nROpu-002Lne-Iu for linux-arm-kernel@lists.infradead.org; Tue, 08 Mar 2022 01:40:27 +0000 Received: by mail-pj1-x1035.google.com with SMTP id kx6-20020a17090b228600b001bf859159bfso867358pjb.1 for ; Mon, 07 Mar 2022 17:40:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=2oZHqNig67lQrBY101pOAHHtLLvXMV3c8bnYL4oUFgs=; b=BqC3IovNxG0EX5R6eBwELil4WePyK5xpcSbZKRaGDvvWQv34opW72yKZwwI0ZERwOy +q3qkTj8qt2V2lOoPUQusa1YS2V2olRuJFZ4SBpb8q1CVMrRLUdR9981BNODggbtVCme dE/RoJ4lXkgCw592blfxLHs1wuvI7YBy+YUdQ6cvp5VtrmI5IBtsaWat8+olN5zakUjC 7dolRIi314WCbw8yMDCVQ8eyH0JLtoPmwWweeGUHBeui/Y+MmyOMZQ/KAFbsolZcm7fa HVxTYqIyWcebbu0sqMVq6Wx5S32fyUmQzMNEqbKDyV1n0YXiZ77VTcOj6jOvPTKgBMSh dmzg== 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:in-reply-to :references; bh=2oZHqNig67lQrBY101pOAHHtLLvXMV3c8bnYL4oUFgs=; b=ClpPEi29JepaS+hHY8ED5KM8NVVUhx8/F2N8LiDLtbji+mHNSM3I726gOvYamJ9hpq rQX8XcUWiyGUk8MOrgO8f6lLw4YcO7kyrr4UVi4rWsrFT7/Zg639Vp4OM0E0XZcA5/vr 4fkvoVzADEUJSzyKQA0TShFZJ5pbX2v7loEKLNTscJqh30iLQSIwCjgWEnrSmsGqkEEy znMOjnAhEtrXf8s8GO3PAHXurBi9GGEVcSixyIacLW5T9Yw0q6bUriz/QFTc7tLSr6M2 WIfku20kpA/0FYipfTfjPLwvdyh6Fc+teyRhLFfmXXiE85HQ4nph9m+pMjE4r6RAN50c nvTA== X-Gm-Message-State: AOAM531XuzT1GyNQKMHGKEFk+lMIK8Wi74TO9SyYrtziZ5QOXmgDQXBv awm7N/+zhPbMv38hM0ludfY= X-Google-Smtp-Source: ABdhPJxEA3atALbfBSMj03rRMPNFxv4vBrK8TkDMyB2LCuJkL3ERSbUrRspo08Cewso0/CaU3sS9Og== X-Received: by 2002:a17:90a:7e95:b0:1bc:5d56:8d4c with SMTP id j21-20020a17090a7e9500b001bc5d568d4cmr1989175pjl.93.1646703623972; Mon, 07 Mar 2022 17:40:23 -0800 (PST) Received: from localhost.localdomain ([159.226.95.43]) by smtp.googlemail.com with ESMTPSA id e14-20020a056a001a8e00b004e136d54a15sm17858175pfv.105.2022.03.07.17.40.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Mar 2022 17:40:23 -0800 (PST) From: Miaoqian Lin To: Codrin Ciubotariu , Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , Nicolas Ferre , Alexandre Belloni , Claudiu Beznea , Florian Meier , alsa-devel@alsa-project.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: linmq006@gmail.com Subject: [PATCH v2] ASoC: atmel: Fix error handling in snd_proto_probe Date: Tue, 8 Mar 2022 01:39:48 +0000 Message-Id: <20220308013949.20323-1-linmq006@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <582c39ac-3099-d54f-5de3-d54a4ace0a04@microchip.com> References: <582c39ac-3099-d54f-5de3-d54a4ace0a04@microchip.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220307_174026_670977_D7EE3EAB X-CRM114-Status: GOOD ( 16.37 ) 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 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 paths. Fix this by calling of_node_put() in error handling too. Fixes: a45f8853a5f9 ("ASoC: Add driver for PROTO Audio CODEC (with a WM8731)") Signed-off-by: Miaoqian Lin Reviewed-by: Codrin Ciubotariu --- changes in v2: - remove extra line. --- sound/soc/atmel/mikroe-proto.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/sound/soc/atmel/mikroe-proto.c b/sound/soc/atmel/mikroe-proto.c index 627564c18c27..ce46d8a0b7e4 100644 --- a/sound/soc/atmel/mikroe-proto.c +++ b/sound/soc/atmel/mikroe-proto.c @@ -115,7 +115,8 @@ static int snd_proto_probe(struct platform_device *pdev) cpu_np = of_parse_phandle(np, "i2s-controller", 0); if (!cpu_np) { dev_err(&pdev->dev, "i2s-controller missing\n"); - return -EINVAL; + ret = -EINVAL; + goto put_codec_node; } dai->cpus->of_node = cpu_np; dai->platforms->of_node = cpu_np; @@ -125,7 +126,8 @@ static int snd_proto_probe(struct platform_device *pdev) &bitclkmaster, &framemaster); if (bitclkmaster != framemaster) { dev_err(&pdev->dev, "Must be the same bitclock and frame master\n"); - return -EINVAL; + ret = -EINVAL; + goto put_cpu_node; } if (bitclkmaster) { if (codec_np == bitclkmaster) @@ -136,18 +138,20 @@ static int snd_proto_probe(struct platform_device *pdev) dai_fmt |= snd_soc_daifmt_parse_clock_provider_as_flag(np, NULL); } - of_node_put(bitclkmaster); - of_node_put(framemaster); - dai->dai_fmt = dai_fmt; - - of_node_put(codec_np); - of_node_put(cpu_np); + dai->dai_fmt = dai_fmt; ret = snd_soc_register_card(&snd_proto); if (ret) dev_err_probe(&pdev->dev, ret, "snd_soc_register_card() failed\n"); + +put_cpu_node: + of_node_put(bitclkmaster); + of_node_put(framemaster); + of_node_put(cpu_np); +put_codec_node: + of_node_put(codec_np); return ret; }