i3c: dw: Fix memory leak in dw_i3c_master_i2c_xfers()

[PATCH] i3c: dw: Fix memory leak in dw_i3c_master_i2c_xfers()

Posted by Zilin Guan 1 week, 6 days ago

The dw_i3c_master_i2c_xfers() function allocates memory for the xfer
structure using dw_i3c_master_alloc_xfer(). If pm_runtime_resume_and_get()
fails, the function returns without freeing the allocated xfer, resulting
in a memory leak.

Add a dw_i3c_master_free_xfer() call to the error path to ensure the
allocated memory is properly freed.

Compile tested only. Issue found using a prototype static analysis tool
and code review.

Fixes: 62fe9d06f570 ("i3c: dw: Add power management support")
Signed-off-by: Zilin Guan <zilin@seu.edu.cn>
---
 drivers/i3c/master/dw-i3c-master.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/i3c/master/dw-i3c-master.c b/drivers/i3c/master/dw-i3c-master.c
index 889e2ed5bc83..3e6f66dff2ec 100644
--- a/drivers/i3c/master/dw-i3c-master.c
+++ b/drivers/i3c/master/dw-i3c-master.c
@@ -1099,6 +1099,7 @@ static int dw_i3c_master_i2c_xfers(struct i2c_dev_desc *dev,
 		dev_err(master->dev,
 			"<%s> cannot resume i3c bus master, err: %d\n",
 			__func__, ret);
+		dw_i3c_master_free_xfer(xfer);
 		return ret;
 	}
 
-- 
2.34.1

Re: [PATCH] i3c: dw: Fix memory leak in dw_i3c_master_i2c_xfers()

Posted by Alexandre Belloni 1 week, 1 day ago

On Mon, 26 Jan 2026 08:11:21 +0000, Zilin Guan wrote:
> The dw_i3c_master_i2c_xfers() function allocates memory for the xfer
> structure using dw_i3c_master_alloc_xfer(). If pm_runtime_resume_and_get()
> fails, the function returns without freeing the allocated xfer, resulting
> in a memory leak.
> 
> Add a dw_i3c_master_free_xfer() call to the error path to ensure the
> allocated memory is properly freed.
> 
> [...]

Applied, thanks!

[1/1] i3c: dw: Fix memory leak in dw_i3c_master_i2c_xfers()
      https://git.kernel.org/i3c/c/253708941351

Best regards,

-- 
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

Re: [PATCH] i3c: dw: Fix memory leak in dw_i3c_master_i2c_xfers()

Posted by Frank Li 1 week, 6 days ago

On Mon, Jan 26, 2026 at 08:11:21AM +0000, Zilin Guan wrote:
> The dw_i3c_master_i2c_xfers() function allocates memory for the xfer
> structure using dw_i3c_master_alloc_xfer(). If pm_runtime_resume_and_get()
> fails, the function returns without freeing the allocated xfer, resulting
> in a memory leak.
>
> Add a dw_i3c_master_free_xfer() call to the error path to ensure the
> allocated memory is properly freed.
>
> Compile tested only. Issue found using a prototype static analysis tool
> and code review.
>
> Fixes: 62fe9d06f570 ("i3c: dw: Add power management support")
> Signed-off-by: Zilin Guan <zilin@seu.edu.cn>
> ---

Reviewed-by: Frank Li <Frank.Li@nxp.com>

After https://lore.kernel.org/linux-i3c/176840902682.1305594.13987931108275156748.b4-ty@bootlin.com/T/#t

driver's runtime pm get code can be removed.

Frank

>  drivers/i3c/master/dw-i3c-master.c | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/drivers/i3c/master/dw-i3c-master.c b/drivers/i3c/master/dw-i3c-master.c
> index 889e2ed5bc83..3e6f66dff2ec 100644
> --- a/drivers/i3c/master/dw-i3c-master.c
> +++ b/drivers/i3c/master/dw-i3c-master.c
> @@ -1099,6 +1099,7 @@ static int dw_i3c_master_i2c_xfers(struct i2c_dev_desc *dev,
>  		dev_err(master->dev,
>  			"<%s> cannot resume i3c bus master, err: %d\n",
>  			__func__, ret);
> +		dw_i3c_master_free_xfer(xfer);
>  		return ret;
>  	}
>
> --
> 2.34.1
>

Re: [PATCH] i3c: dw: Fix memory leak in dw_i3c_master_i2c_xfers()

Posted by Markus Elfring 1 week, 6 days ago

…
> Add a dw_i3c_master_free_xfer() call to the error path to ensure the
> allocated memory is properly freed.
…

https://elixir.bootlin.com/linux/v6.19-rc5/source/drivers/i3c/master/dw-i3c-master.c#L1065-L1137

* Would you like to complete the exception handling by using another goto chain?

* How do you think about to increase the application of scope-based resource management?


See also once more:
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Documentation/process/stable-kernel-rules.rst?h=v6.19-rc7#n34

Regards,
Markus