Messages in this thread Patch in this message | | | From | Kangjie Lu <> | Subject | [PATCH] net: liquidio: fix NULL pointer dereferences | Date | Mon, 11 Mar 2019 00:46:15 -0500 |
| |
In case octeon_alloc_soft_command fails, the fix reports the error and returns to avoid NULL pointer dereferences.
Signed-off-by: Kangjie Lu <kjlu@umn.edu> --- drivers/net/ethernet/cavium/liquidio/lio_vf_main.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
diff --git a/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c b/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c index 54b245797d2e..cc081cda847c 100644 --- a/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c +++ b/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c @@ -611,6 +611,12 @@ static void send_rx_ctrl_cmd(struct lio *lio, int start_stop) sc = (struct octeon_soft_command *) octeon_alloc_soft_command(oct, OCTNET_CMD_SIZE, 16, 0); + if (!sc) { + netif_info(lio, rx_err, lio->netdev, + "Failed to allocate octeon_soft_command\n"); + return; + } + ncmd = (union octnet_cmd *)sc->virtdptr; @@ -1960,6 +1966,12 @@ static int setup_nic_devices(struct octeon_device *octeon_dev) sc = (struct octeon_soft_command *) octeon_alloc_soft_command(octeon_dev, data_size, resp_size, 0); + if (!sc) { + dev_err(&octeon_dev->pci_dev->dev, + "Failed to allocate octeon_soft_command\n"); + return -ENOMEM; + } + resp = (struct liquidio_if_cfg_resp *)sc->virtrptr; vdata = (struct lio_version *)sc->virtdptr; -- 2.17.1
| |