vz: fix two handle leaks

[libvirt] [PATCH 2/2] vz: fix event handle leak in prlsdkHandlePerfEvent

Posted by Maxim Nestratov 9 years ago

When we happen to lose a domain but still get a performance event
for it, we should also free the event handle.

Signed-off-by: Maxim Nestratov <mnestratov@virtuozzo.com>
---
 src/vz/vz_sdk.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c
index ec954dd..614dca1 100644
--- a/src/vz/vz_sdk.c
+++ b/src/vz/vz_sdk.c
@@ -2197,8 +2197,10 @@ prlsdkHandlePerfEvent(vzDriverPtr driver,
     virDomainObjPtr dom = NULL;
     vzDomObjPtr privdom = NULL;
 
-    if (!(dom = virDomainObjListFindByUUID(driver->domains, uuid)))
+    if (!(dom = virDomainObjListFindByUUID(driver->domains, uuid))) {
+        PrlHandle_Free(event);
         return;
+    }
 
     privdom = dom->privateData;
     PrlHandle_Free(privdom->stats);
-- 
2.4.11

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Re: [libvirt] [PATCH 2/2] vz: fix event handle leak in prlsdkHandlePerfEvent

Posted by Daniel P. Berrange 9 years ago

On Wed, Feb 08, 2017 at 06:28:34PM +0300, Maxim Nestratov wrote:
> When we happen to lose a domain but still get a performance event
> for it, we should also free the event handle.
> 
> Signed-off-by: Maxim Nestratov <mnestratov@virtuozzo.com>
> ---
>  src/vz/vz_sdk.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c
> index ec954dd..614dca1 100644
> --- a/src/vz/vz_sdk.c
> +++ b/src/vz/vz_sdk.c
> @@ -2197,8 +2197,10 @@ prlsdkHandlePerfEvent(vzDriverPtr driver,
>      virDomainObjPtr dom = NULL;
>      vzDomObjPtr privdom = NULL;
>  
> -    if (!(dom = virDomainObjListFindByUUID(driver->domains, uuid)))
> +    if (!(dom = virDomainObjListFindByUUID(driver->domains, uuid))) {
> +        PrlHandle_Free(event);
>          return;
> +    }
>  
>      privdom = dom->privateData;
>      PrlHandle_Free(privdom->stats);

ACK

Regards,
Daniel
-- 
|: http://berrange.com      -o-    http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org              -o-             http://virt-manager.org :|
|: http://entangle-photo.org       -o-    http://search.cpan.org/~danberr/ :|

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Re: [libvirt] [PATCH 2/2] vz: fix event handle leak in prlsdkHandlePerfEvent

Posted by Maxim Nestratov 8 years, 12 months ago

08-Feb-17 19:07, Daniel P. Berrange пишет:

> On Wed, Feb 08, 2017 at 06:28:34PM +0300, Maxim Nestratov wrote:
>> When we happen to lose a domain but still get a performance event
>> for it, we should also free the event handle.
>>
>> Signed-off-by: Maxim Nestratov <mnestratov@virtuozzo.com>
>> ---
>>   src/vz/vz_sdk.c | 4 +++-
>>   1 file changed, 3 insertions(+), 1 deletion(-)
>>
>> diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c
>> index ec954dd..614dca1 100644
>> --- a/src/vz/vz_sdk.c
>> +++ b/src/vz/vz_sdk.c
>> @@ -2197,8 +2197,10 @@ prlsdkHandlePerfEvent(vzDriverPtr driver,
>>       virDomainObjPtr dom = NULL;
>>       vzDomObjPtr privdom = NULL;
>>   
>> -    if (!(dom = virDomainObjListFindByUUID(driver->domains, uuid)))
>> +    if (!(dom = virDomainObjListFindByUUID(driver->domains, uuid))) {
>> +        PrlHandle_Free(event);
>>           return;
>> +    }
>>   
>>       privdom = dom->privateData;
>>       PrlHandle_Free(privdom->stats);
> ACK
>
> Regards,
> Daniel

Pushed the series.

Thanks,
Maxim

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list