* [PATCH 5.15.y] octeontx2-pf: handle otx2_mbox_get_rsp errors in otx2_flows.c
@ 2026-05-09 5:58 Robert Garcia
2026-05-09 14:32 ` Sasha Levin
0 siblings, 1 reply; 2+ messages in thread
From: Robert Garcia @ 2026-05-09 5:58 UTC (permalink / raw)
To: stable, Dipendra Khadka
Cc: Andrew Lunn, Simon Horman, Sunil Goutham, Robert Garcia,
Geetha sowjanya, Subbaraya Sundeep, hariprasad, David S . Miller,
Jakub Kicinski, Naveen Mamindlapalli, Paolo Abeni, Suman Ghosh,
netdev, linux-kernel
From: Dipendra Khadka <kdipendra88@gmail.com>
[ Upstream commit 5d55ed19d4190d2c210ac05ac7a53f800a8c6fe5 ]
Adding error pointer check after calling otx2_mbox_get_rsp().
Fixes: 9917060fc30a ("octeontx2-pf: Cleanup flow rule management")
Fixes: f0a1913f8a6f ("octeontx2-pf: Add support for ethtool ntuple filters")
Fixes: 674b3e164238 ("octeontx2-pf: Add additional checks while configuring ucast/bcast/mcast rules")
Signed-off-by: Dipendra Khadka <kdipendra88@gmail.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Robert Garcia <rob_garcia@163.com>
---
drivers/net/ethernet/marvell/octeontx2/nic/otx2_flows.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_flows.c b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_flows.c
index c3e5ebc41667..3c46cb0bd0de 100644
--- a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_flows.c
+++ b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_flows.c
@@ -119,6 +119,8 @@ int otx2_alloc_mcam_entries(struct otx2_nic *pfvf, u16 count)
rsp = (struct npc_mcam_alloc_entry_rsp *)otx2_mbox_get_rsp
(&pfvf->mbox.mbox, 0, &req->hdr);
+ if (IS_ERR(rsp))
+ goto exit;
for (ent = 0; ent < rsp->count; ent++)
flow_cfg->flow_ent[ent + allocated] = rsp->entry_list[ent];
@@ -195,6 +197,10 @@ static int otx2_mcam_entry_init(struct otx2_nic *pfvf)
rsp = (struct npc_mcam_alloc_entry_rsp *)otx2_mbox_get_rsp
(&pfvf->mbox.mbox, 0, &req->hdr);
+ if (IS_ERR(rsp)) {
+ mutex_unlock(&pfvf->mbox.lock);
+ return PTR_ERR(rsp);
+ }
if (rsp->count != req->count) {
netdev_info(pfvf->netdev,
--
2.34.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH 5.15.y] octeontx2-pf: handle otx2_mbox_get_rsp errors in otx2_flows.c
2026-05-09 5:58 [PATCH 5.15.y] octeontx2-pf: handle otx2_mbox_get_rsp errors in otx2_flows.c Robert Garcia
@ 2026-05-09 14:32 ` Sasha Levin
0 siblings, 0 replies; 2+ messages in thread
From: Sasha Levin @ 2026-05-09 14:32 UTC (permalink / raw)
To: stable, Dipendra Khadka
Cc: Sasha Levin, Andrew Lunn, Simon Horman, Sunil Goutham,
Robert Garcia, Geetha sowjanya, Subbaraya Sundeep, hariprasad,
David S . Miller, Jakub Kicinski, Naveen Mamindlapalli,
Paolo Abeni, Suman Ghosh, netdev, linux-kernel
> [ Upstream commit 5d55ed19d4190d2c210ac05ac7a53f800a8c6fe5 ]
Heads up: the cited SHA points at an unrelated drm/amdgpu commit. The
correct upstream for this backport is bd3110bc102a ("octeontx2-pf:
handle otx2_mbox_get_rsp errors in otx2_flows.c"). I fixed up the tag
locally before applying.
Queued for 5.15.y, thanks.
--
Thanks,
Sasha
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2026-05-09 14:32 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-05-09 5:58 [PATCH 5.15.y] octeontx2-pf: handle otx2_mbox_get_rsp errors in otx2_flows.c Robert Garcia
2026-05-09 14:32 ` Sasha Levin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox