Received: by 2002:a05:6a10:6d10:0:0:0:0 with SMTP id gq16csp1027685pxb; Fri, 15 Apr 2022 18:50:44 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzzOGJSXLfrin7VRc9ftfrMnAk2UgT7STqqiv7MGCkKaRSuMK3VCKPbbMXF/D+rbOLZ+T5H X-Received: by 2002:a65:6741:0:b0:39c:c6dc:9076 with SMTP id c1-20020a656741000000b0039cc6dc9076mr1299436pgu.462.1650073844414; Fri, 15 Apr 2022 18:50:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1650073844; cv=none; d=google.com; s=arc-20160816; b=o+FlpidXEXaRYbMzXLeLHU2TDo0Z0ftuXgiXIBQobds/9gy766JyRobZBm7g4l0uS2 xYMYgVejbcYtgvzemIeWEXIDs4eGf2DrSVAP5aA/AOYMKEJOwhZeb9mtjzOlMQKTMmdf c6Chwvjf24OU5+9m7C3PwMvYVrL4if7LhZjBh/r+VJjUvKImp8i114E3afIFSIBuDF3t 3tVR9qktNdwFE153K+iC/rQ9sglAVdIi3HeQHrK4LsQae0tKqCyl345Yr9vcDPfp8T3t CXufzSLLZFXV6LctO/ydRJI8r6XtUCD2DTh7ff9DAl1su6BmVRCWmNCCC2H1ZZwhUSFp 4yZg== 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=xtkKl6bn2wmZ6gRLlH4AaUOmI4tC3+m/aGa53I+In5A=; b=gXfJ7nojrAt9MT53th9vI7TXbVyfE+4kEcKim3o29W8us61BORSa11QULPSt+rjoMb G9E+xudYDoKl/CROxLDyELhNFZ/8+f1Q1FVLgDPcOYDm4H0HYDDtRxeIszwmZAAPB0IV wKnVFgZxzRrVjyUmW+7VCq63gE9jz7b3Uz/RZ7Z6gWNUAGOD4HdYdroeIDNwAA05uFNI o+us8PAl/AkmYhhyMrW0QaS+fnwNo92e5YC9OQwOsbRf/tTtV0jZXyHI2yczyckbC7gu 9+JJOLbXk21UakeA2U5lRI9UBBNkslAj/AhowGvd3B8i2M5CkSx2sQruiu2w/wgtO7vr 7gwA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=YQ9UZJip; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [2620:137:e000::1:18]) by mx.google.com with ESMTPS id y3-20020a17090322c300b00153c0220d44si2810918plg.596.2022.04.15.18.50.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Apr 2022 18:50:44 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=YQ9UZJip; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id AD4DC1965D7; Fri, 15 Apr 2022 18:12:56 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346809AbiDNOLY (ORCPT + 99 others); Thu, 14 Apr 2022 10:11:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49778 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244877AbiDNN2N (ORCPT ); Thu, 14 Apr 2022 09:28:13 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AD985A76F7; Thu, 14 Apr 2022 06:21:12 -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 19E7560BAF; Thu, 14 Apr 2022 13:21:12 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 24D74C385A5; Thu, 14 Apr 2022 13:21:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1649942471; bh=arYmQ6gdhCroZr/XsiSO5yOvG9bBTqXz5YPkWZg9fPc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YQ9UZJip61aHbivt/UwEprZnVUvcao0tbp30N8XQCdyFv2U6NZd8ulk+sFY6rhXu3 IyXAkwF+P7keWClFbTnEYYjNg2kFiQj9SuMdy5A5sXYeyomq3l/ivSv7o36p/pxk9H KDI692JgQXBaFLdzHoHl48CuqeqvZ8K8kzXthxS0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Miaoqian Lin , Mark Brown , Sasha Levin Subject: [PATCH 4.19 111/338] ASoC: mxs: Fix error handling in mxs_sgtl5000_probe Date: Thu, 14 Apr 2022 15:10:14 +0200 Message-Id: <20220414110842.068828264@linuxfoundation.org> X-Mailer: git-send-email 2.35.2 In-Reply-To: <20220414110838.883074566@linuxfoundation.org> References: <20220414110838.883074566@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=no 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 From: Miaoqian Lin [ Upstream commit 6ae0a4d8fec551ec581d620f0eb1fe31f755551c ] This function only calls of_node_put() in the regular path. And it will cause refcount leak in error paths. For example, when codec_np is NULL, saif_np[0] and saif_np[1] are not NULL, it will cause leaks. of_node_put() will check if the node pointer is NULL, so we can call it directly to release the refcount of regular pointers. Fixes: e968194b45c4 ("ASoC: mxs: add device tree support for mxs-sgtl5000") Signed-off-by: Miaoqian Lin Link: https://lore.kernel.org/r/20220308020146.26496-1-linmq006@gmail.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/mxs/mxs-sgtl5000.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sound/soc/mxs/mxs-sgtl5000.c b/sound/soc/mxs/mxs-sgtl5000.c index 2b3f2408301a..c40e0ab49657 100644 --- a/sound/soc/mxs/mxs-sgtl5000.c +++ b/sound/soc/mxs/mxs-sgtl5000.c @@ -120,6 +120,9 @@ static int mxs_sgtl5000_probe(struct platform_device *pdev) codec_np = of_parse_phandle(np, "audio-codec", 0); if (!saif_np[0] || !saif_np[1] || !codec_np) { dev_err(&pdev->dev, "phandle missing or invalid\n"); + of_node_put(codec_np); + of_node_put(saif_np[0]); + of_node_put(saif_np[1]); return -EINVAL; } -- 2.34.1