From: Nicholas Krause <xerofoify@gmail.com>
To: agraf@suse.com
Cc: gleb@kernel.org, pbonzini@redhat.com, kvm-ppc@vger.kernel.org,
kvm@vger.kernel.org, linuxppc-dev@lists.ozlabs.org,
linux-kernel@vger.kernel.org
Subject: [PATCH] kvm:powerpc:Fix error handling in the function mpic_set_default_irq_routing
Date: Thu, 6 Aug 2015 13:13:10 -0400 [thread overview]
Message-ID: <1438881190-27287-1-git-send-email-xerofoify@gmail.com> (raw)
This fixes error handling in the function mpic_set_default_irq_routing
by checking if the call to the function kvm_set_irq_routing has failed
and if so exit immediately to the caller by returning the error code
returned by the call to mpic_set_default_irq_routing.
Signed-off-by: Nicholas Krause <xerofoify@gmail.com>
---
arch/powerpc/kvm/mpic.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
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;
--
2.1.4
next reply other threads:[~2015-08-06 17:13 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-06 17:13 Nicholas Krause [this message]
2015-08-07 10:17 ` [PATCH] kvm:powerpc:Fix error handling in the function mpic_set_default_irq_routing Paolo Bonzini
-- strict thread matches above, loose matches on Subject: below --
2015-08-07 13:47 Nicholas Krause
2015-08-07 13:59 ` Paolo Bonzini
2015-08-07 14:00 ` nick
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1438881190-27287-1-git-send-email-xerofoify@gmail.com \
--to=xerofoify@gmail.com \
--cc=agraf@suse.com \
--cc=gleb@kernel.org \
--cc=kvm-ppc@vger.kernel.org \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=pbonzini@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).