From mboxrd@z Thu Jan 1 00:00:00 1970 From: Nicholas Krause Subject: [PATCH] kvm:powerpc:Fix error handling in the function mpic_set_default_irq_routing Date: Thu, 6 Aug 2015 13:13:10 -0400 Message-ID: <1438881190-27287-1-git-send-email-xerofoify@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Cc: kvm@vger.kernel.org, gleb@kernel.org, linux-kernel@vger.kernel.org, kvm-ppc@vger.kernel.org, pbonzini@redhat.com, linuxppc-dev@lists.ozlabs.org To: agraf@suse.com Return-path: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: linuxppc-dev-bounces+glppe-linuxppc-embedded-2=m.gmane.org@lists.ozlabs.org Sender: "Linuxppc-dev" List-Id: kvm.vger.kernel.org VGhpcyBmaXhlcyBlcnJvciBoYW5kbGluZyBpbiB0aGUgZnVuY3Rpb24gbXBpY19zZXRfZGVmYXVs dF9pcnFfcm91dGluZwpieSBjaGVja2luZyBpZiB0aGUgY2FsbCB0byB0aGUgZnVuY3Rpb24ga3Zt X3NldF9pcnFfcm91dGluZyBoYXMgZmFpbGVkCmFuZCBpZiBzbyBleGl0IGltbWVkaWF0ZWx5IHRv IHRoZSBjYWxsZXIgYnkgcmV0dXJuaW5nIHRoZSBlcnJvciBjb2RlCnJldHVybmVkIGJ5IHRoZSBj YWxsIHRvIG1waWNfc2V0X2RlZmF1bHRfaXJxX3JvdXRpbmcuCgpTaWduZWQtb2ZmLWJ5OiBOaWNo b2xhcyBLcmF1c2UgPHhlcm9mb2lmeUBnbWFpbC5jb20+Ci0tLQogYXJjaC9wb3dlcnBjL2t2bS9t cGljLmMgfCA1ICsrKystCiAxIGZpbGUgY2hhbmdlZCwgNCBpbnNlcnRpb25zKCspLCAxIGRlbGV0 aW9uKC0pCgpkaWZmIC0tZ2l0IGEvYXJjaC9wb3dlcnBjL2t2bS9tcGljLmMgYi9hcmNoL3Bvd2Vy cGMva3ZtL21waWMuYwppbmRleCA2MjQ5Y2RjLi41YTE4ODU5IDEwMDY0NAotLS0gYS9hcmNoL3Bv d2VycGMva3ZtL21waWMuYworKysgYi9hcmNoL3Bvd2VycGMva3ZtL21waWMuYwpAQCAtMTY0MSwx MyArMTY0MSwxNiBAQCBzdGF0aWMgdm9pZCBtcGljX2Rlc3Ryb3koc3RydWN0IGt2bV9kZXZpY2Ug KmRldikKIHN0YXRpYyBpbnQgbXBpY19zZXRfZGVmYXVsdF9pcnFfcm91dGluZyhzdHJ1Y3Qgb3Bl bnBpYyAqb3BwKQogewogCXN0cnVjdCBrdm1faXJxX3JvdXRpbmdfZW50cnkgKnJvdXRpbmc7CisJ aW50IHJldDsKIAogCS8qIENyZWF0ZSBhIG5vcCBkZWZhdWx0IG1hcCwgc28gdGhhdCBkZXJlZmVy ZW5jaW5nIGl0IHN0aWxsIHdvcmtzICovCiAJcm91dGluZyA9IGt6YWxsb2MoKHNpemVvZigqcm91 dGluZykpLCBHRlBfS0VSTkVMKTsKIAlpZiAoIXJvdXRpbmcpCiAJCXJldHVybiAtRU5PTUVNOwog Ci0Ja3ZtX3NldF9pcnFfcm91dGluZyhvcHAtPmt2bSwgcm91dGluZywgMCwgMCk7CisJcmV0ID0g a3ZtX3NldF9pcnFfcm91dGluZyhvcHAtPmt2bSwgcm91dGluZywgMCwgMCk7CisJaWYgKHJldCkK KwkJcmV0dXJuIHJldDsKIAogCWtmcmVlKHJvdXRpbmcpOwogCXJldHVybiAwOwotLSAKMi4xLjQK Cl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkxpbnV4cHBj LWRldiBtYWlsaW5nIGxpc3QKTGludXhwcGMtZGV2QGxpc3RzLm96bGFicy5vcmcKaHR0cHM6Ly9s aXN0cy5vemxhYnMub3JnL2xpc3RpbmZvL2xpbnV4cHBjLWRldg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-ig0-x234.google.com (mail-ig0-x234.google.com [IPv6:2607:f8b0:4001:c05::234]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 0BB611A088A for ; Fri, 7 Aug 2015 03:13:16 +1000 (AEST) Received: by igr7 with SMTP id 7so15470045igr.0 for ; Thu, 06 Aug 2015 10:13:14 -0700 (PDT) From: Nicholas Krause 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 Message-Id: <1438881190-27287-1-git-send-email-xerofoify@gmail.com> List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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 --- 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