From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1898DC3A5A1 for ; Thu, 22 Aug 2019 17:16:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D6D3B2089E for ; Thu, 22 Aug 2019 17:16:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1566494163; bh=7PacgezBhWgl49FGiKUsGiEA921Ao2dsp7XTPPO661U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=MDLmqYFAFOBuf+MFmF7YH3Uu6tlMYoRUjIDt6MzL2AkZrk8v9/1i+WcQdsN1Mx5sv NRrKAK4I6SFLcJAOnwgj8ta49xWOatfcEjagKv3MaGT1emcUXchK83f4u8fgBpiNEi Z3Dr4CGOtIJWZA/XJsrtU0COx8d/Y1WUdvRs+tNQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391202AbfHVRQC (ORCPT ); Thu, 22 Aug 2019 13:16:02 -0400 Received: from mail.kernel.org ([198.145.29.99]:58190 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390429AbfHVRIj (ORCPT ); Thu, 22 Aug 2019 13:08:39 -0400 Received: from sasha-vm.mshome.net (wsip-184-188-36-2.sd.sd.cox.net [184.188.36.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 3A30823402; Thu, 22 Aug 2019 17:08:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1566493719; bh=7PacgezBhWgl49FGiKUsGiEA921Ao2dsp7XTPPO661U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VpH9QfAaeq2dPs+EFjRNMN7x2y/PKOL7niCWlhC17ubWWrOfFTV2lkpIfTrCNbl2i xYEVCfJkWRCtRCQUxJGg8AtE41tog3bHeuNpd5l4JGKFUhzKJUa3htfAU+a6wAYkia 2rndjLzgeWdfwT5LqZt85jN+4S8/B6NqOWJyB4to= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Nianyao Tang , Thomas Gleixner , Jason Cooper , Marc Zyngier , Shaokun Zhang , Marc Zyngier , Sasha Levin Subject: [PATCH 5.2 047/135] irqchip/gic-v3-its: Free unused vpt_page when alloc vpe table fail Date: Thu, 22 Aug 2019 13:06:43 -0400 Message-Id: <20190822170811.13303-48-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190822170811.13303-1-sashal@kernel.org> References: <20190822170811.13303-1-sashal@kernel.org> MIME-Version: 1.0 X-KernelTest-Patch: http://kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.2.10-rc1.gz X-KernelTest-Tree: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git X-KernelTest-Branch: linux-5.2.y X-KernelTest-Patches: git://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git X-KernelTest-Version: 5.2.10-rc1 X-KernelTest-Deadline: 2019-08-24T17:07+00:00 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Nianyao Tang [ Upstream commit 34f8eb92ca053cbba2887bb7e4dbf2b2cd6eb733 ] In its_vpe_init, when its_alloc_vpe_table fails, we should free vpt_page allocated just before, instead of vpe->vpt_page. Let's fix it. Cc: Thomas Gleixner Cc: Jason Cooper Cc: Marc Zyngier Signed-off-by: Nianyao Tang Signed-off-by: Shaokun Zhang Signed-off-by: Marc Zyngier Signed-off-by: Sasha Levin --- drivers/irqchip/irq-gic-v3-its.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/irqchip/irq-gic-v3-its.c b/drivers/irqchip/irq-gic-v3-its.c index 35500801dc2b5..20e5482d91b94 100644 --- a/drivers/irqchip/irq-gic-v3-its.c +++ b/drivers/irqchip/irq-gic-v3-its.c @@ -3010,7 +3010,7 @@ static int its_vpe_init(struct its_vpe *vpe) if (!its_alloc_vpe_table(vpe_id)) { its_vpe_id_free(vpe_id); - its_free_pending_table(vpe->vpt_page); + its_free_pending_table(vpt_page); return -ENOMEM; } -- 2.20.1