[PATCH] kvm: irqchip: fix memory leak

[PATCH] kvm: irqchip: fix memory leak

[Sudip Mukherjee]

We were taking the exit path after checking ue->flags and return value
of setup_routing_entry(), but 'e' was not freed incase of a failure.

Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
---
 virt/kvm/irqchip.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/virt/kvm/irqchip.c b/virt/kvm/irqchip.c
index 21c1424..c63e54f 100644
--- a/virt/kvm/irqchip.c
+++ b/virt/kvm/irqchip.c
@@ -213,11 +213,15 @@ int kvm_set_irq_routing(struct kvm *kvm,
 			goto out;
 
 		r = -EINVAL;
-		if (ue->flags)
+		if (ue->flags) {
+			kfree(e);
 			goto out;
+		}
 		r = setup_routing_entry(new, e, ue);
-		if (r)
+		if (r) {
+			kfree(e);
 			goto out;
+		}
 		++ue;
 	}
 
-- 
1.9.1

Re: [PATCH] kvm: irqchip: fix memory leak

[Paolo Bonzini]

On 02/09/2015 09:03, Sudip Mukherjee wrote:
> We were taking the exit path after checking ue->flags and return value
> of setup_routing_entry(), but 'e' was not freed incase of a failure.
> 
> Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
> ---
>  virt/kvm/irqchip.c | 8 ++++++--
>  1 file changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/virt/kvm/irqchip.c b/virt/kvm/irqchip.c
> index 21c1424..c63e54f 100644
> --- a/virt/kvm/irqchip.c
> +++ b/virt/kvm/irqchip.c
> @@ -213,11 +213,15 @@ int kvm_set_irq_routing(struct kvm *kvm,
>  			goto out;
>  
>  		r = -EINVAL;
> -		if (ue->flags)
> +		if (ue->flags) {
> +			kfree(e);
>  			goto out;
> +		}
>  		r = setup_routing_entry(new, e, ue);
> -		if (r)
> +		if (r) {
> +			kfree(e);
>  			goto out;
> +		}
>  		++ue;
>  	}
>  
> 

Queued, thanks.

Paolo

Re: [PATCH] kvm: irqchip: fix memory leak

[William Dauchy]

[-- Attachment #1: Type: text/plain, Size: 1189 bytes --]

Hi Paolo,

I was wondering it this could be a valid candidate for -stable, don't you think?
(commit ba60c41)

Best regards,

On Sep02 12:33, Sudip Mukherjee wrote:
> We were taking the exit path after checking ue->flags and return value
> of setup_routing_entry(), but 'e' was not freed incase of a failure.
> 
> Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
> ---
>  virt/kvm/irqchip.c | 8 ++++++--
>  1 file changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/virt/kvm/irqchip.c b/virt/kvm/irqchip.c
> index 21c1424..c63e54f 100644
> --- a/virt/kvm/irqchip.c
> +++ b/virt/kvm/irqchip.c
> @@ -213,11 +213,15 @@ int kvm_set_irq_routing(struct kvm *kvm,
>  			goto out;
>  
>  		r = -EINVAL;
> -		if (ue->flags)
> +		if (ue->flags) {
> +			kfree(e);
>  			goto out;
> +		}
>  		r = setup_routing_entry(new, e, ue);
> -		if (r)
> +		if (r) {
> +			kfree(e);
>  			goto out;
> +		}
>  		++ue;
>  	}
>  
> -- 
> 1.9.1
> 
> --
> To unsubscribe from this list: send the line "unsubscribe kvm" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

-- 
William

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 181 bytes --]

Re: [PATCH] kvm: irqchip: fix memory leak

[Paolo Bonzini]

On 03/11/2015 22:17, William Dauchy wrote:
> Hi Paolo,
> 
> I was wondering it this could be a valid candidate for -stable, don't you think?
> (commit ba60c41)

Indeed, feel free to propose it!

Paolo

> Best regards,
> 
> On Sep02 12:33, Sudip Mukherjee wrote:
>> We were taking the exit path after checking ue->flags and return value
>> of setup_routing_entry(), but 'e' was not freed incase of a failure.
>>
>> Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
>> ---
>>  virt/kvm/irqchip.c | 8 ++++++--
>>  1 file changed, 6 insertions(+), 2 deletions(-)
>>
>> diff --git a/virt/kvm/irqchip.c b/virt/kvm/irqchip.c
>> index 21c1424..c63e54f 100644
>> --- a/virt/kvm/irqchip.c
>> +++ b/virt/kvm/irqchip.c
>> @@ -213,11 +213,15 @@ int kvm_set_irq_routing(struct kvm *kvm,
>>  			goto out;
>>  
>>  		r = -EINVAL;
>> -		if (ue->flags)
>> +		if (ue->flags) {
>> +			kfree(e);
>>  			goto out;
>> +		}
>>  		r = setup_routing_entry(new, e, ue);
>> -		if (r)
>> +		if (r) {
>> +			kfree(e);
>>  			goto out;
>> +		}
>>  		++ue;
>>  	}
>>  
>> -- 
>> 1.9.1
>>
>> --
>> To unsubscribe from this list: send the line "unsubscribe kvm" in
>> the body of a message to majordomo@vger.kernel.org
>> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 

Re: [PATCH] kvm: irqchip: fix memory leak

[Paolo Bonzini]

On 03/11/2015 22:17, William Dauchy wrote:
> Hi Paolo,
> 
> I was wondering it this could be a valid candidate for -stable, don't you think?
> (commit ba60c41)

Certainly, feel free to propose it to stable@vger.kernel.org!

Paolo

> Best regards,
> 
> On Sep02 12:33, Sudip Mukherjee wrote:
>> We were taking the exit path after checking ue->flags and return value
>> of setup_routing_entry(), but 'e' was not freed incase of a failure.
>>
>> Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
>> ---
>>  virt/kvm/irqchip.c | 8 ++++++--
>>  1 file changed, 6 insertions(+), 2 deletions(-)
>>
>> diff --git a/virt/kvm/irqchip.c b/virt/kvm/irqchip.c
>> index 21c1424..c63e54f 100644
>> --- a/virt/kvm/irqchip.c
>> +++ b/virt/kvm/irqchip.c
>> @@ -213,11 +213,15 @@ int kvm_set_irq_routing(struct kvm *kvm,
>>  			goto out;
>>  
>>  		r = -EINVAL;
>> -		if (ue->flags)
>> +		if (ue->flags) {
>> +			kfree(e);
>>  			goto out;
>> +		}
>>  		r = setup_routing_entry(new, e, ue);
>> -		if (r)
>> +		if (r) {
>> +			kfree(e);
>>  			goto out;
>> +		}
>>  		++ue;
>>  	}
>>  
>> -- 
>> 1.9.1
>>
>> --
>> To unsubscribe from this list: send the line "unsubscribe kvm" in
>> the body of a message to majordomo@vger.kernel.org
>> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>