Skip to contentSkip to conversation

i3c: master: renesas: Fix a memory leak and use __free(kfree) to simplify the code

PATCH Applied Felix Gu 4 participants 7 messages Apr 6 – Apr 12

Subsystems (2)
lore
Share & tools
lore

Felix Gu

author
#0 lore raw

v3 cover i3c: master: renesas: Fix a memory leak and use __free(kfree) to simplify the code

---
Changes in v3:
- Collect the tags from Frank and Tommaso.
- Use __free(kfree) to simplify the code.
- Link to v2: https://lore.kernel.org/r/[email protected]

Changes in v2:
- Add cleanup header file to fix Frank's comment.
- Link to v1: https://lore.kernel.org/r/[email protected]

---
Felix Gu (2):
i3c: master: renesas: Fix memory leak in renesas_i3c_i3c_xfers()
i3c: master: renesas: Use __free(kfree) for xfer cleanup in renesas_i3c_send_ccc_cmd()

 drivers/i3c/master/renesas-i3c.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

---
base-commit: bd0f139e5fc11182777b81cefc3893ea508544ec
change-id: 20260402-renesas-c6afdaf9bc2e

Best regards,

Signature · 1 line
Felix Gu <[email protected]>
author
#1 lore raw

PATCH v3 1/2 i3c: master: renesas: Fix memory leak in renesas_i3c_i3c_xfers()

The xfer structure allocated by renesas_i3c_alloc_xfer() was never freed in the renesas_i3c_i3c_xfers() function. Use the __free(kfree) cleanup attribute to automatically free the memory when the variable goes out of scope.

Fixes d028219a9f14 ("i3c: master: Add basic driver for the Renesas I3C controller")
---
 drivers/i3c/master/renesas-i3c.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/i3c/master/renesas-i3c.c +2 -2
index d9f5b30a4b2f..a8a9e89a9710 100644
@@ -8,6 +8,7 @@
 
 #include <linux/bitfield.h>
 #include <linux/bitops.h>
+#include <linux/cleanup.h>
 #include <linux/clk.h>
 #include <linux/completion.h>
 #include <linux/err.h>
@@ -817,13 +818,12 @@ static int renesas_i3c_i3c_xfers(struct i3c_dev_desc *dev, struct i3c_xfer *i3c_
 	struct i3c_master_controller *m = i3c_dev_get_master(dev);
 	struct renesas_i3c *i3c = to_renesas_i3c(m);
 	struct renesas_i3c_i2c_dev_data *data = i3c_dev_get_master_data(dev);
-	struct renesas_i3c_xfer *xfer;
 	int i;
 
 	/* Enable I3C bus. */
 	renesas_i3c_bus_enable(m, true);
 
-	xfer = renesas_i3c_alloc_xfer(i3c, 1);
+	struct renesas_i3c_xfer *xfer __free(kfree) = renesas_i3c_alloc_xfer(i3c, 1);
 	if (!xfer)
 		return -ENOMEM;
 
Signature · 1 line
2.43.0
author
#2 lore raw

PATCH v3 2/2 i3c: master: renesas: Use __free(kfree) for xfer cleanup in renesas_i3c_send_ccc_cmd()

In reply to Felix Gu

Use __free(kfree) for automatic cleanup, matching the pattern already used in other functions in this driver.

---
 drivers/i3c/master/renesas-i3c.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/i3c/master/renesas-i3c.c +1 -4
index a8a9e89a9710..f39c449922ca 100644
@@ -748,7 +748,6 @@ static int renesas_i3c_send_ccc_cmd(struct i3c_master_controller *m,
 					   struct i3c_ccc_cmd *ccc)
 {
 	struct renesas_i3c *i3c = to_renesas_i3c(m);
-	struct renesas_i3c_xfer *xfer;
 	struct renesas_i3c_cmd *cmd;
 	int ret, pos = 0;
 
@@ -758,7 +757,7 @@ static int renesas_i3c_send_ccc_cmd(struct i3c_master_controller *m,
 			return pos;
 	}
 
-	xfer = renesas_i3c_alloc_xfer(i3c, 1);
+	struct renesas_i3c_xfer *xfer __free(kfree) = renesas_i3c_alloc_xfer(i3c, 1);
 	if (!xfer)
 		return -ENOMEM;
 
@@ -807,8 +806,6 @@ static int renesas_i3c_send_ccc_cmd(struct i3c_master_controller *m,
 	if (ret)
 		ccc->err = I3C_ERROR_M2;
 
-	kfree(xfer);
-
 	return ret;
 }
 
Signature · 1 line
2.43.0
reviewer Reviewed-by on v3 2/2
#3 lore raw

Re: [PATCH v3 2/2] i3c: master: renesas: Use __free(kfree) for xfer cleanup in renesas_i3c_send_ccc_cmd()

Quoted 5 lines · Felix Gu

Use __free(kfree) for automatic cleanup, matching the pattern already used in other functions in this driver.

---

Quoted 42 lines
 drivers/i3c/master/renesas-i3c.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/i3c/master/renesas-i3c.c +1 -5
index a8a9e89a9710..f39c449922ca 100644
@@ -748,7 +748,6 @@ static int renesas_i3c_send_ccc_cmd(struct i3c_master_controller *m,
 					   struct i3c_ccc_cmd *ccc)
 {
 	struct renesas_i3c *i3c = to_renesas_i3c(m);
-	struct renesas_i3c_xfer *xfer;
 	struct renesas_i3c_cmd *cmd;
 	int ret, pos = 0;
 
@@ -758,7 +757,7 @@ static int renesas_i3c_send_ccc_cmd(struct i3c_master_controller *m,
 			return pos;
 	}
 
-	xfer = renesas_i3c_alloc_xfer(i3c, 1);
+	struct renesas_i3c_xfer *xfer __free(kfree) = renesas_i3c_alloc_xfer(i3c, 1);
 	if (!xfer)
 		return -ENOMEM;
 
@@ -807,8 +806,6 @@ static int renesas_i3c_send_ccc_cmd(struct i3c_master_controller *m,
 	if (ret)
 		ccc->err = I3C_ERROR_M2;
 
-	kfree(xfer);
-
 	return ret;
 }
 
 
--

2.43.0

--
linux-i3c mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-i3c

maintainer Tested-by Reviewed-by on v3 2/2
#4 lore raw

Re: [PATCH v3 2/2] i3c: master: renesas: Use __free(kfree) for xfer cleanup in renesas_i3c_send_ccc_cmd()

In reply to Felix Gu

Hi Felix,
Thanks for your patch.

Quoted 3 lines · Felix Gu

Use __free(kfree) for automatic cleanup, matching the pattern already used in other functions in this driver.

Kind Regards,
Tommaso

Quoted 39 lines
---
 drivers/i3c/master/renesas-i3c.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/i3c/master/renesas-i3c.c +1 -4
index a8a9e89a9710..f39c449922ca 100644
@@ -748,7 +748,6 @@ static int renesas_i3c_send_ccc_cmd(struct i3c_master_controller *m,
 					   struct i3c_ccc_cmd *ccc)
 {
 	struct renesas_i3c *i3c = to_renesas_i3c(m);
-	struct renesas_i3c_xfer *xfer;
 	struct renesas_i3c_cmd *cmd;
 	int ret, pos = 0;
 
@@ -758,7 +757,7 @@ static int renesas_i3c_send_ccc_cmd(struct i3c_master_controller *m,
 			return pos;
 	}
 
-	xfer = renesas_i3c_alloc_xfer(i3c, 1);
+	struct renesas_i3c_xfer *xfer __free(kfree) = renesas_i3c_alloc_xfer(i3c, 1);
 	if (!xfer)
 		return -ENOMEM;
 
@@ -807,8 +806,6 @@ static int renesas_i3c_send_ccc_cmd(struct i3c_master_controller *m,
 	if (ret)
 		ccc->err = I3C_ERROR_M2;
 
-	kfree(xfer);
-
 	return ret;
 }
 
Signature · 2 lines
-- 
2.43.0
maintainer Applied
#5 lore raw
In reply to Felix Gu
Quoted 1 line · Felix Gu

Applied, thanks!

[1/2] i3c: master: renesas: Fix memory leak in renesas_i3c_i3c_xfers()

      https://git.kernel.org/i3c/c/d7665c3b4f57
[2/2] i3c: master: renesas: Use __free(kfree) for xfer cleanup in renesas_i3c_send_ccc_cmd()
      https://git.kernel.org/i3c/c/57c91ca3dd87

Best regards,

Signature · 3 lines
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
maintainer Applied
#6 lore raw
In reply to Felix Gu
Quoted 1 line · Felix Gu

Applied, thanks!

[1/2] i3c: master: renesas: Fix memory leak in renesas_i3c_i3c_xfers()

      https://git.kernel.org/i3c/c/d7665c3b4f57
[2/2] i3c: master: renesas: Use __free(kfree) for xfer cleanup in renesas_i3c_send_ccc_cmd()
      https://git.kernel.org/i3c/c/57c91ca3dd87

Best regards,

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