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 0C58F1A76A5; Tue, 30 Jul 2024 17:11:42 +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=1722359502; cv=none; b=fI51RUY1D3J5D4Q5coWef0f+pF0vF7ZItnQpsDZ9rv/0YYwoF/ToLy36GXhAJ+h3gRRZq607tBrVCI5s2jc/kY/n4zPiZjAwht/yMd9fTivumX8MvuL01M6CVYdYiGkjSWv5SroFNiF2TE1HOu+5OFAKbHukzFkQdhItCnM0PXM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722359502; c=relaxed/simple; bh=OttFG6MErymp/2oZ2MIUaRzJFdLm5rviiRyAx2uQGNo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GatHNMNOLHYwKkSTbvzJQYlKIpHQXna5qm7EciaXo9OB+UhRaYQdKkCDiFQzyYavNFsgWRn28duJefBWy7I4RoXq4g1oXnEFqi/Oj49IOw8szyz1N7oYv2olxm8g+HSIzXGM08AcyUlpiIoGzLF57Mi/H1q5KdHo47tGjVJKLg4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=oJJV9+HC; 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="oJJV9+HC" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8284CC32782; Tue, 30 Jul 2024 17:11:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1722359501; bh=OttFG6MErymp/2oZ2MIUaRzJFdLm5rviiRyAx2uQGNo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oJJV9+HCXmqUMxkLqCUHVba4p+VXZEG4WhJuVXGQUEK0vzbrIGn5hv6QDycQUw0rr Gj7sKeWqY6eE3ok8KSBJUfevB3wtQ7iOCn0IUShVU71YAaud6GD+AcgdxtAB99cFjz b0+5QsoOIUtJxyYlvCf5SiPq8ZMMvhhmhsnxNNsk= 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.10 493/809] pinctrl: ti: ti-iodelay: fix possible memory leak when pinctrl_enable() fails Date: Tue, 30 Jul 2024 17:46:09 +0200 Message-ID: <20240730151744.211358097@linuxfoundation.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240730151724.637682316@linuxfoundation.org> References: <20240730151724.637682316@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.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Yang Yingliang [ Upstream commit 9b401f4a7170125365160c9af267a41ff6b39001 ] 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 add missing of_node_put() in the error path. 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-4-yangyingliang@huawei.com Signed-off-by: Linus Walleij Signed-off-by: Sasha Levin --- drivers/pinctrl/ti/pinctrl-ti-iodelay.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/pinctrl/ti/pinctrl-ti-iodelay.c b/drivers/pinctrl/ti/pinctrl-ti-iodelay.c index 040f2c46a868d..ef97586385019 100644 --- a/drivers/pinctrl/ti/pinctrl-ti-iodelay.c +++ b/drivers/pinctrl/ti/pinctrl-ti-iodelay.c @@ -876,7 +876,7 @@ static int ti_iodelay_probe(struct platform_device *pdev) iod->desc.name = dev_name(dev); iod->desc.owner = THIS_MODULE; - ret = pinctrl_register_and_init(&iod->desc, dev, iod, &iod->pctl); + ret = devm_pinctrl_register_and_init(dev, &iod->desc, iod, &iod->pctl); if (ret) { dev_err(dev, "Failed to register pinctrl\n"); goto exit_out; @@ -884,7 +884,11 @@ static int ti_iodelay_probe(struct platform_device *pdev) platform_set_drvdata(pdev, iod); - return pinctrl_enable(iod->pctl); + ret = pinctrl_enable(iod->pctl); + if (ret) + goto exit_out; + + return 0; exit_out: of_node_put(np); @@ -899,9 +903,6 @@ static void ti_iodelay_remove(struct platform_device *pdev) { struct ti_iodelay_device *iod = platform_get_drvdata(pdev); - if (iod->pctl) - pinctrl_unregister(iod->pctl); - ti_iodelay_pinconf_deinit_dev(iod); /* Expect other allocations to be freed by devm */ -- 2.43.0