Skip to contentSkip to conversation

nfp: flower-ct: check for error in nfp_fl_ct_offload_nft_flow()

PATCH Applied Dan Carpenter 4 participants 4 messages Jun 19, 2021 – Jun 21, 2021

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

PATCH 1/1 nfp: flower-ct: check for error in nfp_fl_ct_offload_nft_flow()

The nfp_fl_ct_add_flow() function can fail so we need to check for failure.

Fixes 95255017e0a8 ("nfp: flower-ct: add nft flows to nft list")
---
 drivers/net/ethernet/netronome/nfp/flower/conntrack.c | 2 ++
 1 file changed, 2 insertions(+)
drivers/net/ethernet/netronome/nfp/flower/conntrack.c +2 -0
index 9ea77bb3b69c..273d529d43c2 100644
@@ -1067,6 +1067,8 @@ nfp_fl_ct_offload_nft_flow(struct nfp_fl_ct_zone_entry *zt, struct flow_cls_offl
 						    nfp_ct_map_params);
 		if (!ct_map_ent) {
 			ct_entry = nfp_fl_ct_add_flow(zt, NULL, flow, true, extack);
+			if (IS_ERR(ct_entry))
+				return PTR_ERR(ct_entry);
 			ct_entry->type = CT_TYPE_NFT;
 			list_add(&ct_entry->list_node, &zt->nft_flows_list);
 			zt->nft_flows_count++;
Signature · 1 line
2.30.2
Reviewed-by on v1 1/1
#1 lore raw
Quoted 5 lines · Dan Carpenter

The nfp_fl_ct_add_flow() function can fail so we need to check for failure.

Fixes 95255017e0a8 ("nfp: flower-ct: add nft flows to nft list")

Ah, of course, thank you.

Quoted 18 lines
---
 drivers/net/ethernet/netronome/nfp/flower/conntrack.c | 2 ++
 1 file changed, 2 insertions(+)
drivers/net/ethernet/netronome/nfp/flower/conntrack.c +2 -0
index 9ea77bb3b69c..273d529d43c2 100644
@@ -1067,6 +1067,8 @@ nfp_fl_ct_offload_nft_flow(struct nfp_fl_ct_zone_entry *zt, struct flow_cls_offl
 						    nfp_ct_map_params);
 		if (!ct_map_ent) {
 			ct_entry = nfp_fl_ct_add_flow(zt, NULL, flow, true, extack);
+			if (IS_ERR(ct_entry))
+				return PTR_ERR(ct_entry);
 			ct_entry->type = CT_TYPE_NFT;
 			list_add(&ct_entry->list_node, &zt->nft_flows_list);
 			zt->nft_flows_count++;
#3 lore raw
In reply to Dan Carpenter
This patch was applied to netdev/net-next.git (refs/heads/master):

Hello:

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

Quoted 8 lines · On Sat, 19 Jun 2021 16:53:26 +0300 you wrote:

The nfp_fl_ct_add_flow() function can fail so we need to check for failure.

Fixes 95255017e0a8 ("nfp: flower-ct: add nft flows to nft list")
---
 drivers/net/ethernet/netronome/nfp/flower/conntrack.c | 2 ++
 1 file changed, 2 insertions(+)

Here is the summary with links:
- [net-next] nfp: flower-ct: check for error in nfp_fl_ct_offload_nft_flow()

    https://git.kernel.org/netdev/net-next/c/43c9a8111680

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