Skip to contentSkip to conversation

octeontx2-af: debugfs: fix error return of allocations

PATCH Applied Niels Dossche 3 participants 3 messages Apr 30, 2022 – May 2, 2022

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 octeontx2-af: debugfs: fix error return of allocations

Current memory failure code in the debugfs returns -ENOSPC. This is normally used for indicating that there is no space left on the device and is not applicable for memory allocation failures. Replace this with -ENOMEM.

Fixes 0daa55d033b0 ("octeontx2-af: cn10k: debugfs for dumping LMTST map table")
Fixes 23205e6d06d4 ("octeontx2-af: Dump current resource provisioning status")

---

I found this issue using static analysis to find inconsistent error handling regarding kernel APIs. Found on v5.17.5.
As I do not have the necessary hardware, I only managed to compile test this on x86_64. I wasn't too sure if it belongs in -net-next or -net, because while it could theoretically affect users and is a bug in principle, it probably doesn't do much harm.

 drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c +2 -2
index d1eddb769a41..2ad73b180276 100644
@@ -248,7 +248,7 @@ static ssize_t rvu_dbg_lmtst_map_table_display(struct file *filp,
 
 	buf = kzalloc(buf_size, GFP_KERNEL);
 	if (!buf)
-		return -ENOSPC;
+		return -ENOMEM;
 
 	tbl_base = rvu_read64(rvu, BLKADDR_APR, APR_AF_LMT_MAP_BASE);
 
@@ -407,7 +407,7 @@ static ssize_t rvu_dbg_rsrc_attach_status(struct file *filp,
 
 	buf = kzalloc(buf_size, GFP_KERNEL);
 	if (!buf)
-		return -ENOSPC;
+		return -ENOMEM;
 
 	/* Get the maximum width of a column */
 	lf_str_size = get_max_column_width(rvu);
Signature · 1 line
2.36.0
maintainer
#1 lore raw

drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c static ssize_t rvu_dbg_rsrc_attach_status(struct file *filp, · line 413

Quoted 9 lines · On Sat, 30 Apr 2022 21:46:56 +0200 Niels Dossche wrote:
drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c +1 -1
@@ -407,7 +407,7 @@ static ssize_t rvu_dbg_rsrc_attach_status(struct file *filp,
 
 	buf = kzalloc(buf_size, GFP_KERNEL);
 	if (!buf)
-		return -ENOSPC;
+		return -ENOMEM;
 
 	/* Get the maximum width of a column */
 	lf_str_size = get_max_column_width(rvu);

Looks intentional, other allocation failures in this file use ENOMEM. Still probably worth cleaning up, applied to net-next.

#2 lore raw
In reply to Niels Dossche
This patch was applied to netdev/net-next.git (master) by Jakub Kicinski <[email protected]>:

Hello:

This patch was applied to netdev/net-next.git (master) by Jakub Kicinski <[email protected]>:

Quoted 10 lines · On Sat, 30 Apr 2022 21:46:56 +0200 you wrote:

Current memory failure code in the debugfs returns -ENOSPC. This is normally used for indicating that there is no space left on the device and is not applicable for memory allocation failures. Replace this with -ENOMEM.

Fixes 0daa55d033b0 ("octeontx2-af: cn10k: debugfs for dumping LMTST map table")
Fixes 23205e6d06d4 ("octeontx2-af: Dump current resource provisioning status")

[...]

Here is the summary with links:
- [net] octeontx2-af: debugfs: fix error return of allocations

    https://git.kernel.org/netdev/net-next/c/0b9f1b265ee1

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html