1*4882a593SmuzhiyunFrom dc9777dc17697b196c415c53187a55861d41fd2a Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Alexey Makhalov <amakhalov@vmware.com> 3*4882a593SmuzhiyunDate: Wed, 8 Jul 2020 21:30:43 +0000 4*4882a593SmuzhiyunSubject: [PATCH] xnu: Fix double free in grub_xnu_devprop_add_property() 5*4882a593SmuzhiyunMIME-Version: 1.0 6*4882a593SmuzhiyunContent-Type: text/plain; charset=UTF-8 7*4882a593SmuzhiyunContent-Transfer-Encoding: 8bit 8*4882a593Smuzhiyun 9*4882a593Smuzhiyungrub_xnu_devprop_add_property() should not free utf8 and utf16 as it get 10*4882a593Smuzhiyunallocated and freed in the caller. 11*4882a593Smuzhiyun 12*4882a593SmuzhiyunMinor improvement: do prop fields initialization after memory allocations. 13*4882a593Smuzhiyun 14*4882a593SmuzhiyunFixes: CID 292442, CID 292457, CID 292460, CID 292466 15*4882a593Smuzhiyun 16*4882a593SmuzhiyunSigned-off-by: Alexey Makhalov <amakhalov@vmware.com> 17*4882a593SmuzhiyunReviewed-by: Daniel Kiper <daniel.kiper@oracle.com> 18*4882a593SmuzhiyunSigned-off-by: Stefan Sørensen <stefan.sorensen@spectralink.com> 19*4882a593Smuzhiyun--- 20*4882a593Smuzhiyun grub-core/loader/i386/xnu.c | 17 ++++++++--------- 21*4882a593Smuzhiyun 1 file changed, 8 insertions(+), 9 deletions(-) 22*4882a593Smuzhiyun 23*4882a593Smuzhiyundiff --git a/grub-core/loader/i386/xnu.c b/grub-core/loader/i386/xnu.c 24*4882a593Smuzhiyunindex b7d176b5d..e9e119259 100644 25*4882a593Smuzhiyun--- a/grub-core/loader/i386/xnu.c 26*4882a593Smuzhiyun+++ b/grub-core/loader/i386/xnu.c 27*4882a593Smuzhiyun@@ -262,20 +262,19 @@ grub_xnu_devprop_add_property (struct grub_xnu_devprop_device_descriptor *dev, 28*4882a593Smuzhiyun if (!prop) 29*4882a593Smuzhiyun return grub_errno; 30*4882a593Smuzhiyun 31*4882a593Smuzhiyun- prop->name = utf8; 32*4882a593Smuzhiyun- prop->name16 = utf16; 33*4882a593Smuzhiyun- prop->name16len = utf16len; 34*4882a593Smuzhiyun- 35*4882a593Smuzhiyun- prop->length = datalen; 36*4882a593Smuzhiyun- prop->data = grub_malloc (prop->length); 37*4882a593Smuzhiyun+ prop->data = grub_malloc (datalen); 38*4882a593Smuzhiyun if (!prop->data) 39*4882a593Smuzhiyun { 40*4882a593Smuzhiyun- grub_free (prop->name); 41*4882a593Smuzhiyun- grub_free (prop->name16); 42*4882a593Smuzhiyun grub_free (prop); 43*4882a593Smuzhiyun return grub_errno; 44*4882a593Smuzhiyun } 45*4882a593Smuzhiyun- grub_memcpy (prop->data, data, prop->length); 46*4882a593Smuzhiyun+ grub_memcpy (prop->data, data, datalen); 47*4882a593Smuzhiyun+ 48*4882a593Smuzhiyun+ prop->name = utf8; 49*4882a593Smuzhiyun+ prop->name16 = utf16; 50*4882a593Smuzhiyun+ prop->name16len = utf16len; 51*4882a593Smuzhiyun+ prop->length = datalen; 52*4882a593Smuzhiyun+ 53*4882a593Smuzhiyun grub_list_push (GRUB_AS_LIST_P (&dev->properties), 54*4882a593Smuzhiyun GRUB_AS_LIST (prop)); 55*4882a593Smuzhiyun return GRUB_ERR_NONE; 56*4882a593Smuzhiyun-- 57*4882a593Smuzhiyun2.26.2 58*4882a593Smuzhiyun 59