grub2/0395-Revert-efinet-memory-leak-on-module-removal.patch
Peter Jones 8c6b1ac71e Reconcile with upstream once again.
Also include some minor fixes for gcc 5.1.1

Signed-off-by: Peter Jones <pjones@redhat.com>
2015-07-22 09:46:32 -04:00

35 lines
1.1 KiB
Diff

From cc699535e57e0d0f099090e64a63037c7834f104 Mon Sep 17 00:00:00 2001
From: Andrei Borzenkov <arvidjaar@gmail.com>
Date: Mon, 4 May 2015 09:13:53 +0300
Subject: [PATCH 395/506] Revert "efinet: memory leak on module removal"
This reverts commits 47b2bee3ef0ea60fc3f5bfc37f3784e559385297
and 8d3c4544ffdd0289a4b0bdeb0cdc6355f801a4b3. It is not safe
to free allocated cards, dangling pointers main remain. Such
cleanup requires more changes in net core.
---
grub-core/net/drivers/efi/efinet.c | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c
index a879dec..f171f20 100644
--- a/grub-core/net/drivers/efi/efinet.c
+++ b/grub-core/net/drivers/efi/efinet.c
@@ -278,12 +278,6 @@ GRUB_MOD_FINI(efinet)
FOR_NET_CARDS_SAFE (card, next)
if (card->driver == &efidriver)
- {
- grub_net_card_unregister (card);
- grub_free (card->txbuf);
- grub_free (card->rcvbuf);
- grub_free ((char *)card->name);
- grub_free (card);
- }
+ grub_net_card_unregister (card);
}
--
2.4.3