From patchwork Tue Oct 20 16:19:03 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoffer Dall X-Patchwork-Id: 55318 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f200.google.com (mail-wi0-f200.google.com [209.85.212.200]) by patches.linaro.org (Postfix) with ESMTPS id 0A43223024 for ; Tue, 20 Oct 2015 16:21:06 +0000 (UTC) Received: by wikv3 with SMTP id v3sf11352834wik.1 for ; Tue, 20 Oct 2015 09:21:05 -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:precedence:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:cc:mime-version :content-type:content-transfer-encoding:sender:errors-to :x-original-sender:x-original-authentication-results:mailing-list; bh=ilG397Ty/s0yxR5t44l1vYWsA1ZdMPUm5NTiU/BIaSk=; b=G04tRtswoPJE//nGgcfhjNaXTrVAe9LXvtYwKhjhzCS/i8N7oZdtc64DnwgmHjC+8d KZX3duSylrL1cHOqr+MPVj1FAGD+FL7Suxxj2fyldY3mFKAaS1rXOQ/0EcmOovHPMldS uZrzvBPTCLlqOlpyah1DY5uOcPRT71ppFxCaSjbssOUifGYSs6hc/FWgwowyGmTNqGDq bC+doSs9MI4TH61TCtS8t0z18FjNS4d1o2kRXjQWnw1SlUnoKpEo3FQFtsdySblblE0F s3lcX+uPGRhS7obsGULVy9+WcTXgXPZdsE0rQy/Ia8Nv4hy3HmzjGCNpVqhPX/KJEvCs ETwg== X-Gm-Message-State: ALoCoQlOIiAOrlJlB4BqbLsIyq/EfT8NUVJSXA4akIZRoZKXcpoH8FB1S9Ge5XVRtm2bSo6zOafx X-Received: by 10.112.159.4 with SMTP id wy4mr834552lbb.15.1445358065357; Tue, 20 Oct 2015 09:21:05 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.25.162.139 with SMTP id l133ls87440lfe.46.gmail; Tue, 20 Oct 2015 09:21:05 -0700 (PDT) X-Received: by 10.112.62.137 with SMTP id y9mr2344850lbr.63.1445358065214; Tue, 20 Oct 2015 09:21:05 -0700 (PDT) Received: from mail-lb0-f173.google.com (mail-lb0-f173.google.com. [209.85.217.173]) by mx.google.com with ESMTPS id h75si2860796lfe.140.2015.10.20.09.21.05 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 20 Oct 2015 09:21:05 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.173 as permitted sender) client-ip=209.85.217.173; Received: by lbbes7 with SMTP id es7so19261528lbb.2 for ; Tue, 20 Oct 2015 09:21:05 -0700 (PDT) X-Received: by 10.112.17.34 with SMTP id l2mr2431812lbd.117.1445358065083; Tue, 20 Oct 2015 09:21:05 -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.59.35 with SMTP id w3csp2179505lbq; Tue, 20 Oct 2015 09:21:04 -0700 (PDT) X-Received: by 10.107.36.14 with SMTP id k14mr4560171iok.158.1445358064166; Tue, 20 Oct 2015 09:21:04 -0700 (PDT) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id l4si19192047igx.38.2015.10.20.09.21.03 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 20 Oct 2015 09:21:04 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org designates 2001:1868:205::9 as permitted sender) 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 1ZoZdK-00010i-TI; Tue, 20 Oct 2015 16:19:30 +0000 Received: from mail-lf0-f50.google.com ([209.85.215.50]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZoZcr-0000WR-At for linux-arm-kernel@lists.infradead.org; Tue, 20 Oct 2015 16:19:03 +0000 Received: by lffz202 with SMTP id z202so8460214lff.3 for ; Tue, 20 Oct 2015 09:18:39 -0700 (PDT) X-Received: by 10.25.169.68 with SMTP id s65mr1628199lfe.78.1445357919232; Tue, 20 Oct 2015 09:18:39 -0700 (PDT) Received: from localhost.localdomain (0187900153.0.fullrate.dk. [2.110.55.193]) by smtp.gmail.com with ESMTPSA id t188sm644170lfe.33.2015.10.20.09.18.38 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 20 Oct 2015 09:18:38 -0700 (PDT) From: Christoffer Dall To: Paolo Bonzini , kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [GIT PULL 2/6] KVM: arm/arm64: Fix memory leak if timer initialization fails Date: Tue, 20 Oct 2015 18:19:03 +0200 Message-Id: <1445357947-6022-3-git-send-email-christoffer.dall@linaro.org> X-Mailer: git-send-email 2.1.2.330.g565301e.dirty In-Reply-To: <1445357947-6022-1-git-send-email-christoffer.dall@linaro.org> References: <1445357947-6022-1-git-send-email-christoffer.dall@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20151020_091901_673733_B728EAA4 X-CRM114-Status: GOOD ( 12.08 ) X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.215.50 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.215.50 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , Cc: Marc Zyngier , Pavel Fedin , Christoffer Dall 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.173 as permitted sender) smtp.mailfrom=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: Pavel Fedin Jump to correct label and free kvm_host_cpu_state Reviewed-by: Wei Huang Signed-off-by: Pavel Fedin Signed-off-by: Christoffer Dall --- arch/arm/kvm/arm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c index dc017ad..78b2869 100644 --- a/arch/arm/kvm/arm.c +++ b/arch/arm/kvm/arm.c @@ -1080,7 +1080,7 @@ static int init_hyp_mode(void) */ err = kvm_timer_hyp_init(); if (err) - goto out_free_mappings; + goto out_free_context; #ifndef CONFIG_HOTPLUG_CPU free_boot_hyp_pgd();