[PATCH] octeontx2-af: Fix memory leak of object buf

Subsystems: marvell octeontx2 rvu admin function driver, networking drivers, the rest

STALE1961d

3 messages, 3 authors, 2021-03-24 · open the first message on its own page

[PATCH] octeontx2-af: Fix memory leak of object buf

From: Colin King <hidden>
Date: 2021-03-23 12:33:36

From: Colin Ian King <redacted>

Currently the error return path when lfs fails to allocate is not free'ing
the memory allocated to buf. Fix this by adding the missing kfree.

Addresses-Coverity: ("Resource leak")
Fixes: f7884097141b ("octeontx2-af: Formatting debugfs entry rsrc_alloc.")
Signed-off-by: Colin Ian King <redacted>
---
 drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c b/drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c
index 8ec17ee72b5d..9bf8eaabf9ab 100644
--- a/drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c
+++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c
@@ -253,8 +253,10 @@ static ssize_t rvu_dbg_rsrc_attach_status(struct file *filp,
 		return -ENOSPC;
 
 	lfs = kzalloc(lf_str_size, GFP_KERNEL);
-	if (!lfs)
+	if (!lfs) {
+		kfree(buf);
 		return -ENOMEM;
+	}
 	off +=	scnprintf(&buf[off], buf_size - 1 - off, "%-*s", lf_str_size,
 			  "pcifunc");
 	for (index = 0; index < BLK_COUNT; index++)
-- 
2.30.2

Re: [PATCH] octeontx2-af: Fix memory leak of object buf

From: Sunil Kovvuri <hidden>
Date: 2021-03-24 07:08:19

On Tue, Mar 23, 2021 at 6:07 PM Colin King [off-list ref] wrote:
quoted hunk
From: Colin Ian King <redacted>

Currently the error return path when lfs fails to allocate is not free'ing
the memory allocated to buf. Fix this by adding the missing kfree.

Addresses-Coverity: ("Resource leak")
Fixes: f7884097141b ("octeontx2-af: Formatting debugfs entry rsrc_alloc.")
Signed-off-by: Colin Ian King <redacted>
---
 drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c b/drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c
index 8ec17ee72b5d..9bf8eaabf9ab 100644
--- a/drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c
+++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c
@@ -253,8 +253,10 @@ static ssize_t rvu_dbg_rsrc_attach_status(struct file *filp,
                return -ENOSPC;

        lfs = kzalloc(lf_str_size, GFP_KERNEL);
-       if (!lfs)
+       if (!lfs) {
+               kfree(buf);
                return -ENOMEM;
+       }
        off +=  scnprintf(&buf[off], buf_size - 1 - off, "%-*s", lf_str_size,
                          "pcifunc");
        for (index = 0; index < BLK_COUNT; index++)
--
2.30.2
Thanks for the fix,
Acked-by: Sunil Goutham <sgoutham@marvell.com>

Re: [PATCH] octeontx2-af: Fix memory leak of object buf

From: patchwork-bot+netdevbpf@kernel.org
Date: 2021-03-24 19:41:00

Hello:

This patch was applied to netdev/net.git (refs/heads/master):

On Tue, 23 Mar 2021 12:32:45 +0000 you wrote:
From: Colin Ian King <redacted>

Currently the error return path when lfs fails to allocate is not free'ing
the memory allocated to buf. Fix this by adding the missing kfree.

Addresses-Coverity: ("Resource leak")
Fixes: f7884097141b ("octeontx2-af: Formatting debugfs entry rsrc_alloc.")
Signed-off-by: Colin Ian King <redacted>

[...]
Here is the summary with links:
  - octeontx2-af: Fix memory leak of object buf
    https://git.kernel.org/netdev/net/c/9e0a537d06fc

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html

Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help