| Message ID | 1701236508-22930-1-git-send-email-sbhatta@marvell.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 830139e7b6911266a84a77e1f18abf758995cc89 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [v3,net] octeontx2-af: Check return value of nix_get_nixlf before using nixlf | expand |
Hello: This patch was applied to netdev/net.git (main) by David S. Miller <davem@davemloft.net>: On Wed, 29 Nov 2023 11:11:48 +0530 you wrote: > If a NIXLF is not attached to a PF/VF device then > nix_get_nixlf function fails and returns proper error > code. But npc_get_default_entry_action does not check it > and uses garbage value in subsequent calls. Fix this > by cheking the return value of nix_get_nixlf. > > Fixes: 967db3529eca ("octeontx2-af: add support for multicast/promisc packet replication feature") > Signed-off-by: Subbaraya Sundeep <sbhatta@marvell.com> > > [...] Here is the summary with links: - [v3,net] octeontx2-af: Check return value of nix_get_nixlf before using nixlf https://git.kernel.org/netdev/net/c/830139e7b691 You are awesome, thank you!
diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c b/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c index 16cfc80..f658058 100644 --- a/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c +++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c @@ -389,7 +389,13 @@ static u64 npc_get_default_entry_action(struct rvu *rvu, struct npc_mcam *mcam, int bank, nixlf, index; /* get ucast entry rule entry index */ - nix_get_nixlf(rvu, pf_func, &nixlf, NULL); + if (nix_get_nixlf(rvu, pf_func, &nixlf, NULL)) { + dev_err(rvu->dev, "%s: nixlf not attached to pcifunc:0x%x\n", + __func__, pf_func); + /* Action 0 is drop */ + return 0; + } + index = npc_get_nixlf_mcam_index(mcam, pf_func, nixlf, NIXLF_UCAST_ENTRY); bank = npc_get_bank(mcam, index);
If a NIXLF is not attached to a PF/VF device then nix_get_nixlf function fails and returns proper error code. But npc_get_default_entry_action does not check it and uses garbage value in subsequent calls. Fix this by cheking the return value of nix_get_nixlf. Fixes: 967db3529eca ("octeontx2-af: add support for multicast/promisc packet replication feature") Signed-off-by: Subbaraya Sundeep <sbhatta@marvell.com> --- v3 changes: Added version history v2 changes: CCed AF driver maintainers and original author of patch drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)