Received: by 2002:a05:6a10:2726:0:0:0:0 with SMTP id ib38csp922651pxb; Wed, 6 Apr 2022 04:23:05 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxVAAHo0v3oSZ5d8bPeWccQb51AIE9P9TkZXtToP4DJZ4m+5ciZKER++Ups2HudO4JxTRXt X-Received: by 2002:a17:90b:4ccb:b0:1c9:c1de:9c9d with SMTP id nd11-20020a17090b4ccb00b001c9c1de9c9dmr9436692pjb.105.1649244185475; Wed, 06 Apr 2022 04:23:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649244185; cv=none; d=google.com; s=arc-20160816; b=SI6O19ZesVepMnU97CVSZyiWtBhdDGUZRqhQ0DhsdHDndyADFY0rMZXJqIZ9/rt88B vBaStgrmrR37PTcPwTcLLvINlKlCQKB7NfYgQ/zQQPiwoWP5Z0BHuB6kjw11wNGisieJ Jph+FkGL/oaLBEyAn0nX/1ctrWLjatflmoHIzP1PbbybhqRAlbPi6EdixDUYC3USX7ay dbY/Me2bGjqi+eQPKUFkcZJqlDZBq6ifW+R72v4NXZVUehY6lH7MpdqYQzumDgE3qmWZ wFTRiohbOlG/Aspga860xabSUnGvh4+Sm5RQCm+2k2xImj8FP6Yn1+x3W08OHhnXnYT4 GMKg== 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=iNx09RKDi8srFw0AbSjV9w6i9pE/MGRW19cnHQGAzwY=; b=J6UZvGSy168tYxpv/b2JgYocCdbWeWvUyYJUhm6XWjzluC9PnPcoLi+pkx2fe2/Ccg U5VLBQd6Pd6jBHl9rAgsiJS9+PMD3xa140KEiPLsG+FEgsDrfkCOjwKPTmElzYiL7aST aDb2pPQhAFLr0QylGAEPM8/56PTYEOB0031hU9y/4FL2n9oxJ7+RoTEgZCqBK16FSKoV IStPU8s4SdgUwPolrAPQijac0yKL6lZIJctEWRFoeMM5VdZcQ1fKhmyWP6IP3ivehEcY pzARNgHS67taABCJ00M9iamYM6rQe4u2ZajvrVTQM4AaRSogj78HiKhAFznGiSZk29zp fWDg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=spIvrFBH; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 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. [23.128.96.19]) by mx.google.com with ESMTPS id r9-20020a639b09000000b003816043ef57si15838095pgd.332.2022.04.06.04.23.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Apr 2022 04:23:05 -0700 (PDT) Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=spIvrFBH; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 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 144995F168A; Wed, 6 Apr 2022 02:44:57 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1583379AbiDEXwc (ORCPT + 99 others); Tue, 5 Apr 2022 19:52:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43050 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1349239AbiDEJt2 (ORCPT ); Tue, 5 Apr 2022 05:49:28 -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 0D3CD23165; Tue, 5 Apr 2022 02:43:11 -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 9E1A16164D; Tue, 5 Apr 2022 09:43:10 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B03AEC385A1; Tue, 5 Apr 2022 09:43:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1649151790; bh=X0rTzsBGeb+2G6pQhnVePEmfjAUos6BVgAr1tfd3tDY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=spIvrFBHSOFA2cFIVuxA3dNtmJ5e5FjJOsMvJCNF5INfo9ZipI0kcdsgQl7d8dZKx VM0qp3kZIl5DdBOCKqadjVv43c7iD/Cvgpq5tAaxtYFDTSHRHGnIF6FrBi29dmXkDm PGfUkHTaHj0S6kNIfD6Bf94a2fHtvDsyUm8AMg3k= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Xiyu Yang , Xin Tan , Xin Xiong , Claudiu Beznea , Miquel Raynal , Sasha Levin Subject: [PATCH 5.15 535/913] mtd: rawnand: atmel: fix refcount issue in atmel_nand_controller_init Date: Tue, 5 Apr 2022 09:26:37 +0200 Message-Id: <20220405070355.885977918@linuxfoundation.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220405070339.801210740@linuxfoundation.org> References: <20220405070339.801210740@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: Xin Xiong [ Upstream commit fecbd4a317c95d73c849648c406bcf1b6a0ec1cf ] The reference counting issue happens in several error handling paths on a refcounted object "nc->dmac". In these paths, the function simply returns the error code, forgetting to balance the reference count of "nc->dmac", increased earlier by dma_request_channel(), which may cause refcount leaks. Fix it by decrementing the refcount of specific object in those error paths. Fixes: f88fc122cc34 ("mtd: nand: Cleanup/rework the atmel_nand driver") Co-developed-by: Xiyu Yang Signed-off-by: Xiyu Yang Co-developed-by: Xin Tan Signed-off-by: Xin Tan Signed-off-by: Xin Xiong Reviewed-by: Claudiu Beznea Signed-off-by: Miquel Raynal Link: https://lore.kernel.org/linux-mtd/20220304085330.3610-1-xiongx18@fudan.edu.cn Signed-off-by: Sasha Levin --- drivers/mtd/nand/raw/atmel/nand-controller.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/drivers/mtd/nand/raw/atmel/nand-controller.c b/drivers/mtd/nand/raw/atmel/nand-controller.c index f3276ee9e4fe..ddd93bc38ea6 100644 --- a/drivers/mtd/nand/raw/atmel/nand-controller.c +++ b/drivers/mtd/nand/raw/atmel/nand-controller.c @@ -2060,13 +2060,15 @@ static int atmel_nand_controller_init(struct atmel_nand_controller *nc, nc->mck = of_clk_get(dev->parent->of_node, 0); if (IS_ERR(nc->mck)) { dev_err(dev, "Failed to retrieve MCK clk\n"); - return PTR_ERR(nc->mck); + ret = PTR_ERR(nc->mck); + goto out_release_dma; } np = of_parse_phandle(dev->parent->of_node, "atmel,smc", 0); if (!np) { dev_err(dev, "Missing or invalid atmel,smc property\n"); - return -EINVAL; + ret = -EINVAL; + goto out_release_dma; } nc->smc = syscon_node_to_regmap(np); @@ -2074,10 +2076,16 @@ static int atmel_nand_controller_init(struct atmel_nand_controller *nc, if (IS_ERR(nc->smc)) { ret = PTR_ERR(nc->smc); dev_err(dev, "Could not get SMC regmap (err = %d)\n", ret); - return ret; + goto out_release_dma; } return 0; + +out_release_dma: + if (nc->dmac) + dma_release_channel(nc->dmac); + + return ret; } static int -- 2.34.1