Re: [PATCH] kvm:powerpc:Fix error handling in the function mpic_set_default_irq_routing

[Paolo Bonzini]

On 07/08/2015 15:47, Nicholas Krause wrote:
> - kvm_set_irq_routing(opp->kvm, routing, 0, 0);
> + ret = kvm_set_irq_routing(opp->kvm, routing, 0, 0);
> + if (ret) {
> + kfree(routing);
> + return ret;
> + }
>  
>   kfree(routing);
>   return 0;

You could just return ret here.  The new "if" is not necessary.

Paolo
--
To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] kvm:powerpc:Fix error handling in the function mpic_set_default_irq_routing

[Paolo Bonzini]

On 06/08/2015 19:13, Nicholas Krause wrote:
> diff --git a/arch/powerpc/kvm/mpic.c b/arch/powerpc/kvm/mpic.c
> index 6249cdc..5a18859 100644
> --- a/arch/powerpc/kvm/mpic.c
> +++ b/arch/powerpc/kvm/mpic.c
> @@ -1641,13 +1641,16 @@ static void mpic_destroy(struct kvm_device *dev)
>  static int mpic_set_default_irq_routing(struct openpic *opp)
>  {
>   struct kvm_irq_routing_entry *routing;
> + int ret;
>  
>   /* Create a nop default map, so that dereferencing it still works */
>   routing = kzalloc((sizeof(*routing)), GFP_KERNEL);
>   if (!routing)
>   return -ENOMEM;
>  
> - kvm_set_irq_routing(opp->kvm, routing, 0, 0);
> + ret = kvm_set_irq_routing(opp->kvm, routing, 0, 0);
> + if (ret)
> + return ret;
>  
>   kfree(routing);
>   return 0;

The patch leaks the "routing" variable if you hit the error path.

Paolo
--
To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html