From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8F11918D630; Thu, 15 Aug 2024 13:30:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723728615; cv=none; b=YqAjL2sLqW72IAi5ttvf/VOmk39350Y8G0Xjn7SwZUk2O327ymvVsXvnY57yaehbY0d50DcvS1RhD7y3jGzgmcNOOgVgKEEIenLqsM+0HHh7VJ42GlGZzdl2i5lJijrg6gRZ+9To5zdx1g8K6s7mP2gWjEE7TJX4wVHHjMwjmt0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723728615; c=relaxed/simple; bh=a93V6jKELko8y9DL8AdlLSXeyTG7FevgePc7qwqbyd4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=sX0cPN6aMzbyftyz2vL35P1LlpYg2gXSxO9dg6WDXf0GY0vZJWCyfNtTdHCpZjORqP6WbbUc/4RBGNSrV1myidxRd7rVyP9ZVp1RK5SqQ9B227At8qbHcZm1rxKRvyWzqLIIHHA9y4UbkutQwUMI0Mif1VoRr/g+JyYQXQVBxPM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=e967dHDl; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="e967dHDl" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0D2AFC32786; Thu, 15 Aug 2024 13:30:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1723728615; bh=a93V6jKELko8y9DL8AdlLSXeyTG7FevgePc7qwqbyd4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=e967dHDlpe41A7bs0NQHIR4kBskZ+x+2LzQMzPTPl/lD0CJe4+8OHuaX679C9TIZw twAEvTiiz3u2UDkyrBW+c8fM+ihqyrqw7HopRfkYAjIWz6smBScwZrIUBfHIQUNkix GLT5R/EyvvTw5TClWnBVmpLOVwRH1imQLV38/B1w= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Yang Yingliang , Dan Carpenter , Linus Walleij , Sasha Levin Subject: [PATCH 4.19 056/196] pinctrl: single: fix possible memory leak when pinctrl_enable() fails Date: Thu, 15 Aug 2024 15:22:53 +0200 Message-ID: <20240815131854.222167546@linuxfoundation.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240815131852.063866671@linuxfoundation.org> References: <20240815131852.063866671@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 4.19-stable review patch. If anyone has any objections, please let me know. ------------------ From: Yang Yingliang [ Upstream commit 8f773bfbdd428819328a2d185976cfc6ae811cd3 ] This driver calls pinctrl_register_and_init() which is not devm_ managed, it will leads memory leak if pinctrl_enable() fails. Replace it with devm_pinctrl_register_and_init(). And call pcs_free_resources() if pinctrl_enable() fails. Fixes: 5038a66dad01 ("pinctrl: core: delete incorrect free in pinctrl_enable()") Signed-off-by: Yang Yingliang Reviewed-by: Dan Carpenter Link: https://lore.kernel.org/r/20240606023704.3931561-3-yangyingliang@huawei.com Signed-off-by: Linus Walleij Signed-off-by: Sasha Levin --- drivers/pinctrl/pinctrl-single.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/pinctrl/pinctrl-single.c b/drivers/pinctrl/pinctrl-single.c index 4143cafbf7e73..3699843e9a6e8 100644 --- a/drivers/pinctrl/pinctrl-single.c +++ b/drivers/pinctrl/pinctrl-single.c @@ -1311,7 +1311,6 @@ static void pcs_irq_free(struct pcs_device *pcs) static void pcs_free_resources(struct pcs_device *pcs) { pcs_irq_free(pcs); - pinctrl_unregister(pcs->pctl); #if IS_BUILTIN(CONFIG_PINCTRL_SINGLE) if (pcs->missing_nr_pinctrl_cells) @@ -1864,7 +1863,7 @@ static int pcs_probe(struct platform_device *pdev) if (ret < 0) goto free; - ret = pinctrl_register_and_init(&pcs->desc, pcs->dev, pcs, &pcs->pctl); + ret = devm_pinctrl_register_and_init(pcs->dev, &pcs->desc, pcs, &pcs->pctl); if (ret) { dev_err(pcs->dev, "could not register single pinctrl driver\n"); goto free; @@ -1897,8 +1896,10 @@ static int pcs_probe(struct platform_device *pdev) dev_info(pcs->dev, "%i pins, size %u\n", pcs->desc.npins, pcs->size); - return pinctrl_enable(pcs->pctl); + if (pinctrl_enable(pcs->pctl)) + goto free; + return 0; free: pcs_free_resources(pcs); -- 2.43.0