Re: [Xen-devel] [PATCH for-4.5 V6 13/14] Fix freeing of uninitialized pointer

[Roy Franz <roy.franz@xxxxxxxxxx>]

On Thu, Sep 25, 2014 at 1:13 AM, Jan Beulich <JBeulich@xxxxxxxx> wrote:
>>>> On 24.09.14 at 21:22, <roy.franz@xxxxxxxxxx> wrote:
>> On Wed, Sep 24, 2014 at 2:07 AM, Jan Beulich <JBeulich@xxxxxxxx> wrote:
>>> --- a/xen/arch/x86/efi/boot.c
>>> +++ b/xen/arch/x86/efi/boot.c
>>> @@ -595,11 +595,12 @@ static void __init setup_efi_pci(void)
>>>      struct efi_pci_rom *last = NULL;
>>>
>>>      status = efi_bs->LocateHandle(ByProtocol, &pci_guid, NULL, &size, 
>>> NULL);
>>> -    if ( status == EFI_BUFFER_TOO_SMALL )
>>> -        status = efi_bs->AllocatePool(EfiLoaderData, size, (void 
>>> **)&handles);
>>> -    if ( !EFI_ERROR(status) )
>>> -        status = efi_bs->LocateHandle(ByProtocol, &pci_guid, NULL, &size,
>>> -                                      handles);
>>> +    if ( status != EFI_BUFFER_TOO_SMALL )
>>> +        return;
>>> +    status = efi_bs->AllocatePool(EfiLoaderData, size, (void **)&handles);
>>> +    if ( EFI_ERROR(status) )
>>> +        return;
>>> +    status = efi_bs->LocateHandle(ByProtocol, &pci_guid, NULL, &size, 
>>> handles);
>>>      if ( EFI_ERROR(status) )
>>>          size = 0;
>>>
>> OK, I'll use your version, and move it to the start of the patch series.
>
> Did you overlook that I committed it already?
>
> Jan
>
I sure did..

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel