net/nfp: fix null pointer check

[dpdk.git] / drivers / net / nfp / nfp_nspu.c

diff --git a/drivers/net/nfp/nfp_nspu.c b/drivers/net/nfp/nfp_nspu.c
index 2f5632d..0b415fc 100644 (file)
--- a/drivers/net/nfp/nfp_nspu.c
+++ b/drivers/net/nfp/nfp_nspu.c
@@ -11,7 +11,6 @@
 #include <rte_byteorder.h>
 
 #include "nfp_nfpu.h"
-#include "nfp_net_eth.h"
 
 #define CFG_EXP_BAR_ADDR_SZ     1
 #define CFG_EXP_BAR_MAP_TYPE   1
@@ -342,7 +341,12 @@ nfp_fw_upload(nspu_desc_t *nspu_desc)
                return -ENOENT;
        }
 
-       fstat(fw_f, &file_stat);
+       if (fstat(fw_f, &file_stat) < 0) {
+               RTE_LOG(INFO, PMD, "Firmware file %s/%s size is unknown",
+                       DEFAULT_FW_PATH, DEFAULT_FW_FILENAME);
+               close(fw_f);
+               return -ENOENT;
+       }
 
        fsize = file_stat.st_size;
        RTE_LOG(DEBUG, PMD, "Firmware file with size: %" PRIu64 "\n",
@@ -352,12 +356,14 @@ nfp_fw_upload(nspu_desc_t *nspu_desc)
                RTE_LOG(INFO, PMD, "fw file too big: %" PRIu64
                                   " bytes (%" PRIu64 " max)",
                                  (uint64_t)fsize, (uint64_t)size);
+               close(fw_f);
                return -EINVAL;
        }
 
        fw_buf = malloc((size_t)size);
        if (!fw_buf) {
                RTE_LOG(INFO, PMD, "malloc failed for fw buffer");
+               close(fw_f);
                return -ENOMEM;
        }
        memset(fw_buf, 0, size);
@@ -368,12 +374,14 @@ nfp_fw_upload(nspu_desc_t *nspu_desc)
                                   "Just %" PRIu64 " of %" PRIu64 " bytes read.",
                                   (uint64_t)bytes, (uint64_t)fsize);
                free(fw_buf);
+               close(fw_f);
                return -EIO;
        }
 
        ret = nspu_command(nspu_desc, NSP_CMD_FW_LOAD, 0, 1, fw_buf, 0, bytes);
 
        free(fw_buf);
+       close(fw_f);
 
        return ret;
 }
@@ -412,6 +420,9 @@ nfp_nspu_set_bar_from_symbl(nspu_desc_t *desc, const char *symbl,
        int ret = 0;
 
        sym_buf = malloc(desc->buf_size);
+       if (!sym_buf)
+               return -ENOMEM;
+
        strncpy(sym_buf, symbl, strlen(symbl));
        ret = nspu_command(desc, NSP_CMD_GET_SYMBOL, 1, 1, sym_buf,
                           NFP_SYM_DESC_LEN, strlen(symbl));
@@ -601,3 +612,28 @@ nfp_nsp_eth_config(nspu_desc_t *desc, int port, int up)
        rte_spinlock_unlock(&desc->nsp_lock);
        return ret;
 }
+
+int
+nfp_nsp_eth_read_table(nspu_desc_t *desc, union eth_table_entry **table)
+{
+       int ret;
+
+       if (!table)
+               return -EINVAL;
+
+       RTE_LOG(INFO, PMD, "Reading hw ethernet table...\n");
+
+       /* port 0 allocates the eth table and read it using NSPU */
+       *table = malloc(NSP_ETH_TABLE_SIZE);
+       if (!*table)
+               return -ENOMEM;
+
+       ret = nspu_command(desc, NSP_CMD_READ_ETH_TABLE, 1, 0, *table,
+                          NSP_ETH_TABLE_SIZE, 0);
+       if (ret)
+               return ret;
+
+       RTE_LOG(INFO, PMD, "Done\n");
+
+       return 0;
+}