From: Kangjie Lu <kjlu@umn.edu>
Date: Mon, 11 Mar 2019 05:02:32 +0000 (-0500)
Subject: net: liquidio: fix a NULL pointer dereference
X-Git-Tag: v5.1-rc1~31^2~24
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=fe543b2f174f34a7a751aa08b334fe6b105c4569;p=uclinux-h8%2Flinux.git

net: liquidio: fix a NULL pointer dereference

In case octeon_alloc_soft_command fails, the fix reports the
error and returns to avoid NULL pointer dereference.

Signed-off-by: Kangjie Lu <kjlu@umn.edu>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/net/ethernet/cavium/liquidio/lio_main.c b/drivers/net/ethernet/cavium/liquidio/lio_main.c
index 9b7819fdc9de..fb6f813cff65 100644
--- a/drivers/net/ethernet/cavium/liquidio/lio_main.c
+++ b/drivers/net/ethernet/cavium/liquidio/lio_main.c
@@ -1192,6 +1192,11 @@ 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;