On cleanup the txbufs are freed before app cleanup. But app clean-up may
result in control messages due to use of common control paths. There is no
need to clean-up the NIC in such cases so simply discard requests. Without
such a check a NULL pointer dereference occurs.

Fixes: a1db217861f3 ("net: flow_offload: fix flow_indr_dev_unregister path")
Cc: wenxu <we...@ucloud.cn>
Signed-off-by: Simon Horman <simon.hor...@netronome.com>
Signed-off-by: Louis Peens <louis.pe...@netronome.com>
---
 drivers/net/ethernet/netronome/nfp/nfp_net_common.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c 
b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c
index b4acf2f41e84..d86f68aa89bf 100644
--- a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c
+++ b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c
@@ -2084,6 +2084,15 @@ nfp_ctrl_tx_one(struct nfp_net *nn, struct 
nfp_net_r_vector *r_vec,
        dp = &r_vec->nfp_net->dp;
        tx_ring = r_vec->tx_ring;
 
+       if (!tx_ring->txbufs)
+               /* On cleanup the txbufs are freed before app cleanup.
+                * But app clean-up may result in control messages due to
+                * use of common control paths. There is no need to
+                * clean-up the NIC in such cases so simply discard
+                * requests.
+                */
+               goto err_free;
+
        if (WARN_ON_ONCE(skb_shinfo(skb)->nr_frags)) {
                nn_dp_warn(dp, "Driver's CTRL TX does not implement gather\n");
                goto err_free;
-- 
2.20.1

Reply via email to