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 1FE4E189502; Tue, 30 Jul 2024 16:29:27 +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=1722356967; cv=none; b=hOl09YxmMrWcoiVnUazJAIhbwaZAdE4K5QjTtbiTYNBBjiEycWF4fqO1WF/vgli9cH/WTRpkny+EduNHcg2WcM9oCD6zA0QIm5sZAPZmCZ/Q9MeK9DSIns9lMPBXBwZKGfQwYFVSh7HvT35J/1WnPfbe0j5CJsPPNfBj3XnFx+g= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722356967; c=relaxed/simple; bh=m6RGFLRZenry8iywf42LasaxQQ8H1vpNYIXI2N4JwE4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=n88bpNqBmFhdAisdFF94yrPfEzPjCypKYEdpWHp4vucVeX5VnCOp9kgWihiIPznbssEo1CoQHveNVVEU/BBEtqdHpVPgLQTjD/lCkYEiXkS+50tBtaymaHI+yAl0whb7wS42ggP3xEA11arI6JzQhKmIJm+LQNvHM/qGKbNqaQE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=tkwYM0na; 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="tkwYM0na" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7E33BC4AF0A; Tue, 30 Jul 2024 16:29:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1722356967; bh=m6RGFLRZenry8iywf42LasaxQQ8H1vpNYIXI2N4JwE4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tkwYM0naB09RoRTxLFsdXqvw87HjlhEFkp5pUFRg1LZfFNGO9+Scd+EB56POqJO6l 9GOc2ARbGiTkVRdKWyVBtV/Cjx61HObXONzu2wn4t/z+ZlCgmd5fo5xlBCX90poApz nHKPoxNZeKsJmDgbFUygQ/eASrOoORvee2IpQe4I= 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 6.1 246/440] pinctrl: single: fix possible memory leak when pinctrl_enable() fails Date: Tue, 30 Jul 2024 17:47:59 +0200 Message-ID: <20240730151625.459281956@linuxfoundation.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240730151615.753688326@linuxfoundation.org> References: <20240730151615.753688326@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-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 9ad8f70206142..cd23479f352a2 100644 --- a/drivers/pinctrl/pinctrl-single.c +++ b/drivers/pinctrl/pinctrl-single.c @@ -1328,7 +1328,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) @@ -1885,7 +1884,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; @@ -1918,8 +1917,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