From patchwork Mon Mar 16 12:55:02 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoffer Dall X-Patchwork-Id: 45848 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f71.google.com (mail-la0-f71.google.com [209.85.215.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 5ABA721547 for ; Mon, 16 Mar 2015 12:57:51 +0000 (UTC) Received: by lamq1 with SMTP id q1sf26606333lam.3 for ; Mon, 16 Mar 2015 05:57:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:subject:date:message-id :in-reply-to:references:cc:precedence:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:mime-version :content-type:content-transfer-encoding:sender:errors-to :x-original-sender:x-original-authentication-results:mailing-list; bh=xD2NwVucZ49ISONM6FscfLCp27oFjepGItbA5Rmcs9M=; b=Emp1BShNIRPelBcpH4KFONQ9bITjmwD4gSv/HDd8Vfo8bjUcnuQc70XQyXrzLjBauj W6zDLIwiBuKPhDLv7iGMj+I5vy52pTkDvvzBCMMtKftcbc5tcI9h4Puu4Kg3pezvHaWs DUh3Ke3UTA+db0bYifWrAYkulyDQ3AK8kmHlV3zjLdt7gjIcQRVfF58mZZZ8XjrvJ6r1 o9hK8J+IdJV08B2qs0KZp6UtEwk0jBjdHTA2UZn/NPanceOMj6N03U93p05KVOwKZXHi aeedxcoYu2fMDwSKlrofay91eqI14wCqm+kHAkcIsfWcbDtTrP9JNmZYa2LnKupBcJg4 Uosg== X-Gm-Message-State: ALoCoQkwhDVPAHMw+K+AoPsM4+vFDogJzhVAHjqo7WH9saezdPawYwzHcdEUlQbmkhUyqnRgGoPN X-Received: by 10.180.81.134 with SMTP id a6mr3320183wiy.1.1426510670349; Mon, 16 Mar 2015 05:57:50 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.7.208 with SMTP id l16ls615292laa.66.gmail; Mon, 16 Mar 2015 05:57:50 -0700 (PDT) X-Received: by 10.152.36.37 with SMTP id n5mr55616231laj.40.1426510669978; Mon, 16 Mar 2015 05:57:49 -0700 (PDT) Received: from mail-lb0-f170.google.com (mail-lb0-f170.google.com. [209.85.217.170]) by mx.google.com with ESMTPS id t15si1179285lbh.125.2015.03.16.05.57.49 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Mar 2015 05:57:49 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.170 as permitted sender) client-ip=209.85.217.170; Received: by lbcgn8 with SMTP id gn8so19156504lbc.2 for ; Mon, 16 Mar 2015 05:57:49 -0700 (PDT) X-Received: by 10.112.185.66 with SMTP id fa2mr54100243lbc.117.1426510669888; Mon, 16 Mar 2015 05:57:49 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.35.133 with SMTP id h5csp2564571lbj; Mon, 16 Mar 2015 05:57:49 -0700 (PDT) X-Received: by 10.66.217.198 with SMTP id pa6mr138284521pac.49.1426510667835; Mon, 16 Mar 2015 05:57:47 -0700 (PDT) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id dm9si22469308pdb.103.2015.03.16.05.57.47 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Mar 2015 05:57:47 -0700 (PDT) Received-SPF: none (google.com: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org does not designate permitted sender hosts) client-ip=2001:1868:205::9; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1YXUZ2-0004JG-Fx; Mon, 16 Mar 2015 12:56:12 +0000 Received: from mail-la0-f44.google.com ([209.85.215.44]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YXUYF-0003Yx-E9 for linux-arm-kernel@lists.infradead.org; Mon, 16 Mar 2015 12:55:28 +0000 Received: by lagg8 with SMTP id g8so38891502lag.1 for ; Mon, 16 Mar 2015 05:55:04 -0700 (PDT) X-Received: by 10.112.17.98 with SMTP id n2mr22635130lbd.40.1426510504548; Mon, 16 Mar 2015 05:55:04 -0700 (PDT) Received: from localhost.localdomain (188-178-240-98-static.dk.customer.tdc.net. [188.178.240.98]) by mx.google.com with ESMTPSA id a10sm2183013lbk.12.2015.03.16.05.55.02 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 16 Mar 2015 05:55:03 -0700 (PDT) From: Christoffer Dall To: Paolo Bonzini , Marcelo Tosatti Subject: [GIT PULL 4/5] arm/arm64: KVM: fix missing unlock on error in kvm_vgic_create() Date: Mon, 16 Mar 2015 13:55:02 +0100 Message-Id: <1426510503-27995-5-git-send-email-christoffer.dall@linaro.org> X-Mailer: git-send-email 2.1.2.330.g565301e.dirty In-Reply-To: <1426510503-27995-1-git-send-email-christoffer.dall@linaro.org> References: <1426510503-27995-1-git-send-email-christoffer.dall@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150316_055523_706271_FD432E7D X-CRM114-Status: GOOD ( 11.80 ) X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.215.44 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.215.44 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders Cc: kvm@vger.kernel.org, Marc Zyngier , Wei Yongjun , Christoffer Dall , kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: christoffer.dall@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.170 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 From: Wei Yongjun Add the missing unlock before return from function kvm_vgic_create() in the error handling case. Signed-off-by: Wei Yongjun Signed-off-by: Christoffer Dall --- virt/kvm/arm/vgic.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/virt/kvm/arm/vgic.c b/virt/kvm/arm/vgic.c index 0cc6ab6..4b2c2e7 100644 --- a/virt/kvm/arm/vgic.c +++ b/virt/kvm/arm/vgic.c @@ -1583,8 +1583,10 @@ int kvm_vgic_create(struct kvm *kvm, u32 type) * emulation. So check this here again. KVM_CREATE_DEVICE does * the proper checks already. */ - if (type == KVM_DEV_TYPE_ARM_VGIC_V2 && !vgic->can_emulate_gicv2) - return -ENODEV; + if (type == KVM_DEV_TYPE_ARM_VGIC_V2 && !vgic->can_emulate_gicv2) { + ret = -ENODEV; + goto out; + } /* * Any time a vcpu is run, vcpu_load is called which tries to grab the