[PATCH net-next] nfp: flower-ct: fix error return code in nfp_fl_ct_add_offload()

From: Yang Yingliang
Date: Wed Jul 28 2021 - 05:10:21 EST


If nfp_tunnel_add_ipv6_off() fails, it should return error code
in nfp_fl_ct_add_offload().

Fixes: 5a2b93041646 ("nfp: flower-ct: compile match sections of flow_payload")
Reported-by: Hulk Robot <hulkci@xxxxxxxxxx>
Signed-off-by: Yang Yingliang <yangyingliang@xxxxxxxxxx>
---
drivers/net/ethernet/netronome/nfp/flower/conntrack.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/netronome/nfp/flower/conntrack.c b/drivers/net/ethernet/netronome/nfp/flower/conntrack.c
index 1ac3b65df600..bfd7d1c35076 100644
--- a/drivers/net/ethernet/netronome/nfp/flower/conntrack.c
+++ b/drivers/net/ethernet/netronome/nfp/flower/conntrack.c
@@ -710,8 +710,10 @@ static int nfp_fl_ct_add_offload(struct nfp_fl_nft_tc_merge *m_entry)
dst = &gre_match->ipv6.dst;

entry = nfp_tunnel_add_ipv6_off(priv->app, dst);
- if (!entry)
+ if (!entry) {
+ err = -ENOMEM;
goto ct_offload_err;
+ }

flow_pay->nfp_tun_ipv6 = entry;
} else {
@@ -760,8 +762,10 @@ static int nfp_fl_ct_add_offload(struct nfp_fl_nft_tc_merge *m_entry)
dst = &udp_match->ipv6.dst;

entry = nfp_tunnel_add_ipv6_off(priv->app, dst);
- if (!entry)
+ if (!entry) {
+ err = -ENOMEM;
goto ct_offload_err;
+ }

flow_pay->nfp_tun_ipv6 = entry;
} else {
--
2.25.1