1*4882a593SmuzhiyunFrom 320e86747a32e4d46d24ee4b64493741c161da50 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Peter Jones <pjones@redhat.com> 3*4882a593SmuzhiyunDate: Sun, 19 Jul 2020 16:08:08 -0400 4*4882a593SmuzhiyunSubject: [PATCH] emu: Make grub_free(NULL) safe 5*4882a593SmuzhiyunMIME-Version: 1.0 6*4882a593SmuzhiyunContent-Type: text/plain; charset=UTF-8 7*4882a593SmuzhiyunContent-Transfer-Encoding: 8bit 8*4882a593Smuzhiyun 9*4882a593SmuzhiyunThe grub_free() implementation in grub-core/kern/mm.c safely handles 10*4882a593SmuzhiyunNULL pointers, and code at many places depends on this. We don't know 11*4882a593Smuzhiyunthat the same is true on all host OSes, so we need to handle the same 12*4882a593Smuzhiyunbehavior in grub-emu's implementation. 13*4882a593Smuzhiyun 14*4882a593SmuzhiyunSigned-off-by: Peter Jones <pjones@redhat.com> 15*4882a593SmuzhiyunReviewed-by: Darren Kenny <darren.kenny@oracle.com> 16*4882a593SmuzhiyunReviewed-by: Daniel Kiper <daniel.kiper@oracle.com> 17*4882a593SmuzhiyunSigned-off-by: Stefan Sørensen <stefan.sorensen@spectralink.com> 18*4882a593Smuzhiyun--- 19*4882a593Smuzhiyun grub-core/kern/emu/mm.c | 3 ++- 20*4882a593Smuzhiyun 1 file changed, 2 insertions(+), 1 deletion(-) 21*4882a593Smuzhiyun 22*4882a593Smuzhiyundiff --git a/grub-core/kern/emu/mm.c b/grub-core/kern/emu/mm.c 23*4882a593Smuzhiyunindex 145b01d37..4d1046a21 100644 24*4882a593Smuzhiyun--- a/grub-core/kern/emu/mm.c 25*4882a593Smuzhiyun+++ b/grub-core/kern/emu/mm.c 26*4882a593Smuzhiyun@@ -60,7 +60,8 @@ grub_zalloc (grub_size_t size) 27*4882a593Smuzhiyun void 28*4882a593Smuzhiyun grub_free (void *ptr) 29*4882a593Smuzhiyun { 30*4882a593Smuzhiyun- free (ptr); 31*4882a593Smuzhiyun+ if (ptr) 32*4882a593Smuzhiyun+ free (ptr); 33*4882a593Smuzhiyun } 34*4882a593Smuzhiyun 35*4882a593Smuzhiyun void * 36*4882a593Smuzhiyun-- 37*4882a593Smuzhiyun2.26.2 38*4882a593Smuzhiyun 39