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 910BDC433FF for ; Tue, 6 Aug 2019 21:35:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 566582187F for ; Tue, 6 Aug 2019 21:35:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565127344; bh=hnjPdept+35vMcFmZGvmNQcR4/QsLjxDNRb8z2SIzBQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Z/+LZzvTkf/lFCqUnb7t/hnoqghbEmdBe9h/OpTnCPZHXS/Hje4KHQpOmlNb9mFKK T7q+NqaiMwW3+jNYWlZ6GWjmDhKQLcAksWb/U/hKuP8RI0fD5DRLm/jrqPx55btRej 8BAaHunOarNRfppeE7XbydbnrCPbbx/Ovw0zEP8E= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728662AbfHFVfm (ORCPT ); Tue, 6 Aug 2019 17:35:42 -0400 Received: from mail.kernel.org ([198.145.29.99]:53340 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728522AbfHFVfg (ORCPT ); Tue, 6 Aug 2019 17:35:36 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (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 31B08217D9; Tue, 6 Aug 2019 21:35:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565127335; bh=hnjPdept+35vMcFmZGvmNQcR4/QsLjxDNRb8z2SIzBQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yN1jEisrw3+8W85T9HRqmOlb60qgOmvLlQsRl1LnucOkam9gPLKzu+U4vplOpv5PH uj8GZr5hnqc8p9BYUWVjTfQrZo/Wqc8SPPrUgWRA3ERqcu456xun7lRVcXkGKhS9wB KQQ5scvPZhmmgosPUPkD68uxu6H/WMnUG3Y3rJjc= 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 AUTOSEL 4.19 06/32] irqchip/gic-v3-its: Free unused vpt_page when alloc vpe table fail Date: Tue, 6 Aug 2019 17:34:54 -0400 Message-Id: <20190806213522.19859-6-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190806213522.19859-1-sashal@kernel.org> References: <20190806213522.19859-1-sashal@kernel.org> MIME-Version: 1.0 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 ee30e8965d1be..9ba73e11757d9 100644 --- a/drivers/irqchip/irq-gic-v3-its.c +++ b/drivers/irqchip/irq-gic-v3-its.c @@ -2883,7 +2883,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