From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757601AbcBDOTD (ORCPT ); Thu, 4 Feb 2016 09:19:03 -0500 Received: from terminus.zytor.com ([198.137.202.10]:42840 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965649AbcBDOS6 (ORCPT ); Thu, 4 Feb 2016 09:18:58 -0500 Date: Thu, 4 Feb 2016 06:18:37 -0800 From: tip-bot for Shanker Donthineni Message-ID: Cc: linux-kernel@vger.kernel.org, tglx@linutronix.de, hpa@zytor.com, jason@lakedaemon.net, marc.zyngier@arm.com, mingo@kernel.org, vikrams@codeaurora.org, shankerd@codeaurora.org Reply-To: linux-kernel@vger.kernel.org, shankerd@codeaurora.org, vikrams@codeaurora.org, mingo@kernel.org, marc.zyngier@arm.com, hpa@zytor.com, jason@lakedaemon.net, tglx@linutronix.de In-Reply-To: <1454379584-21772-1-git-send-email-shankerd@codeaurora.org> References: <1454379584-21772-1-git-send-email-shankerd@codeaurora.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:irq/urgent] irqchip/gicv3-its: Fix memory leak in its_free_tables() Git-Commit-ID: 1a485f4d2e28efd77075b2952926683d6c245633 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 1a485f4d2e28efd77075b2952926683d6c245633 Gitweb: http://git.kernel.org/tip/1a485f4d2e28efd77075b2952926683d6c245633 Author: Shanker Donthineni AuthorDate: Mon, 1 Feb 2016 20:19:44 -0600 Committer: Thomas Gleixner CommitDate: Thu, 4 Feb 2016 15:14:50 +0100 irqchip/gicv3-its: Fix memory leak in its_free_tables() The current ITS driver has a memory leak in its_free_tables(). It happens on tear down path of the driver when its_probe() call fails. its_free_tables() should free the exact number of pages that have been allocated, not just a single page as current code does. This patch records the memory size for each ITS_BASERn at the time of page allocation and uses the same size information when freeing pages to fix the issue. Signed-off-by: Shanker Donthineni Acked-by: Marc Zyngier Cc: Jason Cooper Cc: Vikram Sethi Cc: linux-arm-kernel@lists.infradead.org Link: http://lkml.kernel.org/r/1454379584-21772-1-git-send-email-shankerd@codeaurora.org Signed-off-by: Thomas Gleixner --- drivers/irqchip/irq-gic-v3-its.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/drivers/irqchip/irq-gic-v3-its.c b/drivers/irqchip/irq-gic-v3-its.c index 3447549..0a73632 100644 --- a/drivers/irqchip/irq-gic-v3-its.c +++ b/drivers/irqchip/irq-gic-v3-its.c @@ -66,7 +66,10 @@ struct its_node { unsigned long phys_base; struct its_cmd_block *cmd_base; struct its_cmd_block *cmd_write; - void *tables[GITS_BASER_NR_REGS]; + struct { + void *base; + u32 order; + } tables[GITS_BASER_NR_REGS]; struct its_collection *collections; struct list_head its_device_list; u64 flags; @@ -807,9 +810,10 @@ static void its_free_tables(struct its_node *its) int i; for (i = 0; i < GITS_BASER_NR_REGS; i++) { - if (its->tables[i]) { - free_page((unsigned long)its->tables[i]); - its->tables[i] = NULL; + if (its->tables[i].base) { + free_pages((unsigned long)its->tables[i].base, + its->tables[i].order); + its->tables[i].base = NULL; } } } @@ -890,7 +894,8 @@ retry_alloc_baser: goto out_free; } - its->tables[i] = base; + its->tables[i].base = base; + its->tables[i].order = order; retry_baser: val = (virt_to_phys(base) | @@ -940,7 +945,7 @@ retry_baser: * something is horribly wrong... */ free_pages((unsigned long)base, order); - its->tables[i] = NULL; + its->tables[i].base = NULL; switch (psz) { case SZ_16K: