[PATCH v1 4/5] net/ntnic: check result of malloc

[Serhii Iliushyk]

Check return value from the malloc code

Signed-off-by: Serhii Iliushyk <sil-plv at napatech.com>
---
 drivers/net/ntnic/dbsconfig/ntnic_dbsconfig.c | 10 ++++++----
 drivers/net/ntnic/nthw/nthw_rac.c             |  5 ++++-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/drivers/net/ntnic/dbsconfig/ntnic_dbsconfig.c b/drivers/net/ntnic/dbsconfig/ntnic_dbsconfig.c
index 222a553684..6ee3beb7bd 100644
--- a/drivers/net/ntnic/dbsconfig/ntnic_dbsconfig.c
+++ b/drivers/net/ntnic/dbsconfig/ntnic_dbsconfig.c
@@ -822,8 +822,9 @@ nthw_setup_mngd_rx_virt_queue_split(nthw_dbs_t *p_nthw_dbs,
 
 	if (p_packet_buffers) {
 		rxvq[index].p_virtual_addr = malloc(queue_size * sizeof(*p_packet_buffers));
-		memcpy(rxvq[index].p_virtual_addr, p_packet_buffers,
-			queue_size * sizeof(*p_packet_buffers));
+		if (rxvq[index].p_virtual_addr)
+			memcpy(rxvq[index].p_virtual_addr, p_packet_buffers,
+				queue_size * sizeof(*p_packet_buffers));
 	}
 
 	nthw_setup_rx_virt_queue(p_nthw_dbs, index, 0, 0, (void *)p_virt_struct_area->phys_addr,
@@ -878,8 +879,9 @@ nthw_setup_mngd_tx_virt_queue_split(nthw_dbs_t *p_nthw_dbs,
 
 	if (p_packet_buffers) {
 		txvq[index].p_virtual_addr = malloc(queue_size * sizeof(*p_packet_buffers));
-		memcpy(txvq[index].p_virtual_addr, p_packet_buffers,
-			queue_size * sizeof(*p_packet_buffers));
+		if (txvq[index].p_virtual_addr)
+			memcpy(txvq[index].p_virtual_addr, p_packet_buffers,
+				queue_size * sizeof(*p_packet_buffers));
 	}
 
 	nthw_setup_tx_virt_queue(p_nthw_dbs, index, 0, 0, (void *)p_virt_struct_area->phys_addr,
diff --git a/drivers/net/ntnic/nthw/nthw_rac.c b/drivers/net/ntnic/nthw/nthw_rac.c
index c22123d936..2257dfb7dc 100644
--- a/drivers/net/ntnic/nthw/nthw_rac.c
+++ b/drivers/net/ntnic/nthw/nthw_rac.c
@@ -31,7 +31,10 @@
 nthw_rac_t *nthw_rac_new(void)
 {
 	nthw_rac_t *p = malloc(sizeof(nthw_rac_t));
-	memset(p, 0, sizeof(nthw_rac_t));
+
+	if (p)
+		memset(p, 0, sizeof(nthw_rac_t));
+
 	return p;
 }
 
-- 
2.45.0