From: Conor Dooley <conor@kernel.org>
To: Felix Gu <ustc.gu@gmail.com>
Cc: Conor Dooley <conor.dooley@microchip.com>,
Daire McNamara <daire.mcnamara@microchip.com>,
linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] soc: microchip: mpfs: Fix a memory leak in mpfs_sys_controller_probe()
Date: Fri, 6 Feb 2026 19:52:15 +0000 [thread overview]
Message-ID: <20260206-neurosis-partner-009242f0ac16@spud> (raw)
In-Reply-To: <20260203-mpfs-v1-1-666b8704f8f7@gmail.com>
[-- Attachment #1.1: Type: text/plain, Size: 1456 bytes --]
On Tue, Feb 03, 2026 at 09:03:52PM +0800, Felix Gu wrote:
> In mpfs_sys_controller_probe(), when of_get_mtd_device_by_node() fails,
> the previously allocated sys_controller was leaked.
>
> Add kfree() to fix this.
>
> Fixes: 742aa6c563d2 ("soc: microchip: mpfs: enable access to the system controller's flash")
> Signed-off-by: Felix Gu <ustc.gu@gmail.com>
> ---
> drivers/soc/microchip/mpfs-sys-controller.c | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/soc/microchip/mpfs-sys-controller.c b/drivers/soc/microchip/mpfs-sys-controller.c
> index 30bc45d17d34..a7401cb79e97 100644
> --- a/drivers/soc/microchip/mpfs-sys-controller.c
> +++ b/drivers/soc/microchip/mpfs-sys-controller.c
> @@ -142,8 +142,11 @@ static int mpfs_sys_controller_probe(struct platform_device *pdev)
>
> sys_controller->flash = of_get_mtd_device_by_node(np);
> of_node_put(np);
> - if (IS_ERR(sys_controller->flash))
> - return dev_err_probe(dev, PTR_ERR(sys_controller->flash), "Failed to get flash\n");
> + if (IS_ERR(sys_controller->flash)) {
> + ret = dev_err_probe(dev, PTR_ERR(sys_controller->flash), "Failed to get flash\n");
> + kfree(sys_controller);
> + return ret;
> + }
>
> no_flash:
> sys_controller->client.dev = dev;
This is a duplicate of a patch in my riscv-soc-fixes branch, that for
whatever reason I forgot to push. I'll keep the original but thanks for
your patch.
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
[-- Attachment #2: Type: text/plain, Size: 161 bytes --]
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
prev parent reply other threads:[~2026-02-06 19:52 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-02-03 13:03 [PATCH] soc: microchip: mpfs: Fix a memory leak in mpfs_sys_controller_probe() Felix Gu
2026-02-03 16:00 ` Markus Elfring
2026-02-06 19:52 ` Conor Dooley [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260206-neurosis-partner-009242f0ac16@spud \
--to=conor@kernel.org \
--cc=conor.dooley@microchip.com \
--cc=daire.mcnamara@microchip.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=ustc.gu@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox