Skip to contentSkip to conversation

octeontx2-af: Fix interrupt name strings

PATCH Applied Subbaraya Sundeep 2 participants 2 messages Jan 7, 2022 – Jan 8, 2022

Subsystems (3)
lore
Share & tools
lore

Subbaraya Sundeep

author maintainer
#0 lore raw

PATCH 1/1 octeontx2-af: Fix interrupt name strings

From: Sunil Goutham <[email protected]>

Fixed interrupt name string logic which currently results in wrong memory location being accessed while dumping /proc/interrupts.

Fixes 4826090719d4 ("octeontx2-af: Enable CPT HW interrupts")
---
 drivers/net/ethernet/marvell/octeontx2/af/rvu_cpt.c     | 5 ++---
 drivers/net/ethernet/marvell/octeontx2/af/rvu_devlink.c | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)
drivers/net/ethernet/marvell/octeontx2/af/rvu_cpt.c +2 -3
index 45357de..a73a801 100644
@@ -172,14 +172,13 @@ static int cpt_10k_register_interrupts(struct rvu_block *block, int off)
 {
 	struct rvu *rvu = block->rvu;
 	int blkaddr = block->addr;
-	char irq_name[16];
 	int i, ret;
 
 	for (i = CPT_10K_AF_INT_VEC_FLT0; i < CPT_10K_AF_INT_VEC_RVU; i++) {
-		snprintf(irq_name, sizeof(irq_name), "CPTAF FLT%d", i);
+		sprintf(&rvu->irq_name[(off + i) * NAME_SIZE], "CPTAF FLT%d", i);
 		ret = rvu_cpt_do_register_interrupt(block, off + i,
 						    rvu_cpt_af_flt_intr_handler,
-						    irq_name);
+						    &rvu->irq_name[(off + i) * NAME_SIZE]);
 		if (ret)
 			goto err;
 		rvu_write64(rvu, blkaddr, CPT_AF_FLTX_INT_ENA_W1S(i), 0x1);
drivers/net/ethernet/marvell/octeontx2/af/rvu_devlink.c +1 -1
index 70bacd3..d0ab8f2 100644
@@ -41,7 +41,7 @@ static bool rvu_common_request_irq(struct rvu *rvu, int offset,
 	struct rvu_devlink *rvu_dl = rvu->rvu_dl;
 	int rc;
 
-	sprintf(&rvu->irq_name[offset * NAME_SIZE], name);
+	sprintf(&rvu->irq_name[offset * NAME_SIZE], "%s", name);
 	rc = request_irq(pci_irq_vector(rvu->pdev, offset), fn, 0,
 			 &rvu->irq_name[offset * NAME_SIZE], rvu_dl);
 	if (rc)
Signature · 1 line
2.7.4
#1 lore raw
This patch was applied to netdev/net.git (master) by Jakub Kicinski <[email protected]>:

Hello:

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

Quoted 11 lines · On Fri, 7 Jan 2022 12:25:05 +0530 you wrote:

From: Sunil Goutham <[email protected]>

Fixed interrupt name string logic which currently results in wrong memory location being accessed while dumping /proc/interrupts.

Fixes 4826090719d4 ("octeontx2-af: Enable CPT HW interrupts")

[...]

Here is the summary with links:
- [net] octeontx2-af: Fix interrupt name strings

    https://git.kernel.org/netdev/net/c/6dc9a23e2906

You are awesome, thank you!

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