* Re: [PATCH] kvm:powerpc:Fix error handling in the function mpic_set_default_irq_routing
[not found] <1438881190-27287-1-git-send-email-xerofoify@gmail.com>
@ 2015-08-07 10:17 ` Paolo Bonzini
0 siblings, 0 replies; 2+ messages in thread
From: Paolo Bonzini @ 2015-08-07 10:17 UTC (permalink / raw)
To: Nicholas Krause, agraf; +Cc: gleb, kvm-ppc, kvm, linuxppc-dev, linux-kernel
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
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] kvm:powerpc:Fix error handling in the function mpic_set_default_irq_routing
[not found] <1438955228-30116-1-git-send-email-xerofoify@gmail.com>
@ 2015-08-07 13:59 ` Paolo Bonzini
0 siblings, 0 replies; 2+ messages in thread
From: Paolo Bonzini @ 2015-08-07 13:59 UTC (permalink / raw)
To: Nicholas Krause, agraf; +Cc: gleb, kvm-ppc, kvm, linuxppc-dev, linux-kernel
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-08-07 13:59 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <1438955228-30116-1-git-send-email-xerofoify@gmail.com>
2015-08-07 13:59 ` [PATCH] kvm:powerpc:Fix error handling in the function mpic_set_default_irq_routing Paolo Bonzini
[not found] <1438881190-27287-1-git-send-email-xerofoify@gmail.com>
2015-08-07 10:17 ` Paolo Bonzini
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox