1From 03f2515ae0c503406f1a99a2178405049c6555db Mon Sep 17 00:00:00 2001
2From: Darren Kenny <darren.kenny@oracle.com>
3Date: Fri, 27 Nov 2020 15:10:26 +0000
4Subject: [PATCH] net/net: Fix possible dereference to of a NULL pointer
5
6It is always possible that grub_zalloc() could fail, so we should check for
7a NULL return. Otherwise we run the risk of dereferencing a NULL pointer.
8
9Fixes: CID 296221
10
11Signed-off-by: Darren Kenny <darren.kenny@oracle.com>
12Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
13Signed-off-by: Stefan Sørensen <stefan.sorensen@spectralink.com>
14---
15 grub-core/net/net.c | 9 +++++++--
16 1 file changed, 7 insertions(+), 2 deletions(-)
17
18diff --git a/grub-core/net/net.c b/grub-core/net/net.c
19index 38f19df..7c2cdf2 100644
20--- a/grub-core/net/net.c
21+++ b/grub-core/net/net.c
22@@ -86,8 +86,13 @@ grub_net_link_layer_add_address (struct grub_net_card *card,
23
24   /* Add sender to cache table.  */
25   if (card->link_layer_table == NULL)
26-    card->link_layer_table = grub_zalloc (LINK_LAYER_CACHE_SIZE
27-					  * sizeof (card->link_layer_table[0]));
28+    {
29+      card->link_layer_table = grub_zalloc (LINK_LAYER_CACHE_SIZE
30+					    * sizeof (card->link_layer_table[0]));
31+      if (card->link_layer_table == NULL)
32+	return;
33+    }
34+
35   entry = &(card->link_layer_table[card->new_ll_entry]);
36   entry->avail = 1;
37   grub_memcpy (&entry->ll_address, ll, sizeof (entry->ll_address));
38--
392.14.2
40
41