diff options
Diffstat (limited to 'meta/recipes-bsp/grub/files/0002-net-net-Fix-possible-dereference-to-of-a-NULL-pointe.patch')
-rw-r--r-- | meta/recipes-bsp/grub/files/0002-net-net-Fix-possible-dereference-to-of-a-NULL-pointe.patch | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/meta/recipes-bsp/grub/files/0002-net-net-Fix-possible-dereference-to-of-a-NULL-pointe.patch b/meta/recipes-bsp/grub/files/0002-net-net-Fix-possible-dereference-to-of-a-NULL-pointe.patch new file mode 100644 index 0000000000..d00821f5c3 --- /dev/null +++ b/meta/recipes-bsp/grub/files/0002-net-net-Fix-possible-dereference-to-of-a-NULL-pointe.patch | |||
@@ -0,0 +1,39 @@ | |||
1 | From f216a75e884ed5e4e94bf86965000dde51148f94 Mon Sep 17 00:00:00 2001 | ||
2 | From: Darren Kenny <darren.kenny@oracle.com> | ||
3 | Date: Fri, 27 Nov 2020 15:10:26 +0000 | ||
4 | Subject: [PATCH] net/net: Fix possible dereference to of a NULL pointer | ||
5 | |||
6 | It is always possible that grub_zalloc() could fail, so we should check for | ||
7 | a NULL return. Otherwise we run the risk of dereferencing a NULL pointer. | ||
8 | |||
9 | Fixes: CID 296221 | ||
10 | |||
11 | Signed-off-by: Darren Kenny <darren.kenny@oracle.com> | ||
12 | Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com> | ||
13 | |||
14 | Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/grub.git/commit/?id=03f2515ae0c503406f1a99a2178405049c6555db] | ||
15 | Signed-off-by: Marta Rybczynska <marta.rybczynska@huawei.com> | ||
16 | --- | ||
17 | grub-core/net/net.c | 9 +++++++-- | ||
18 | 1 file changed, 7 insertions(+), 2 deletions(-) | ||
19 | |||
20 | diff --git a/grub-core/net/net.c b/grub-core/net/net.c | ||
21 | index 38f19df..7c2cdf2 100644 | ||
22 | --- a/grub-core/net/net.c | ||
23 | +++ b/grub-core/net/net.c | ||
24 | @@ -86,8 +86,13 @@ grub_net_link_layer_add_address (struct grub_net_card *card, | ||
25 | |||
26 | /* Add sender to cache table. */ | ||
27 | if (card->link_layer_table == NULL) | ||
28 | - card->link_layer_table = grub_zalloc (LINK_LAYER_CACHE_SIZE | ||
29 | - * sizeof (card->link_layer_table[0])); | ||
30 | + { | ||
31 | + card->link_layer_table = grub_zalloc (LINK_LAYER_CACHE_SIZE | ||
32 | + * sizeof (card->link_layer_table[0])); | ||
33 | + if (card->link_layer_table == NULL) | ||
34 | + return; | ||
35 | + } | ||
36 | + | ||
37 | entry = &(card->link_layer_table[card->new_ll_entry]); | ||
38 | entry->avail = 1; | ||
39 | grub_memcpy (&entry->ll_address, ll, sizeof (entry->ll_address)); | ||