From patchwork Thu Apr 18 06:10:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guanrui Huang X-Patchwork-Id: 13634185 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 33186C4345F for ; Thu, 18 Apr 2024 06:11:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=E4GpQI+PyMtJbgIJz6trFE9kRIPPr1Wwb6+hhSyHOJA=; b=uU0abone6OQuN7 TOLb0UdXjOgKj0RVDPrpGjbuSfkLwORrUn9uA4SMLYAVmME/ItE0txhvF0OuDzzOZESrHzRTXjTcV D/Tk4trTIY2yTEFdqUUKPD+eVeHK9Wc6jcGPudDDvM7tiTbWz0f+98o8CqliRS10L/4gHt5ZQNeIM 9cREAlbniyuKf6je5iBI7FhyKlGg8sRMfoALE7HWLbu297IVHS/8ffDPUlD85LaWaDPFdJM2vXh+w mNZBOp0UHBa1WpjOqYBMj47VBbXpIpFiaQFKq99OuMHO+8BB+dBokYNV6Fdyybxd0HXcLE2qGN18i GiquOMJFnPsupYnrlqNg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rxKzS-000000014Sc-29eK; Thu, 18 Apr 2024 06:11:22 +0000 Received: from out30-130.freemail.mail.aliyun.com ([115.124.30.130]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rxKzL-000000014Od-2vUz for linux-arm-kernel@lists.infradead.org; Thu, 18 Apr 2024 06:11:18 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1713420667; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=j5xhT/xn+HoEPFQEH51jOs/5tUc6xggDrAbLHMmno6Y=; b=i1YjogiGKp/u53D+g39yQxvjV38tXhj3aYcdfESnWcAF0H1jsf4D0nPzXeB3J2lkefXwI1iNc0bp66si/iUm+b4grdS7gAg+ERxTIPOOWGMvs08YlyR8CN85ddg1o6ltJJL3+cuO45xv4/EyLja63bjZK29EfrYKEDMZwuRoY6U= X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R681e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018046060;MF=guanrui.huang@linux.alibaba.com;NM=1;PH=DS;RN=8;SR=0;TI=SMTPD_---0W4nc51F_1713420663; Received: from localhost(mailfrom:guanrui.huang@linux.alibaba.com fp:SMTPD_---0W4nc51F_1713420663) by smtp.aliyun-inc.com; Thu, 18 Apr 2024 14:11:04 +0800 From: Guanrui Huang To: maz@kernel.org Cc: Markus.Elfring@web.de, yuzenghui@huawei.com, shannon.zhao@linux.alibaba.com, tglx@linutronix.de, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Guanrui Huang Subject: [PATCH v5 1/2] irqchip/gic-v3-its: Fix double free on error Date: Thu, 18 Apr 2024 14:10:52 +0800 Message-Id: <20240418061053.96803-2-guanrui.huang@linux.alibaba.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20240418061053.96803-1-guanrui.huang@linux.alibaba.com> References: <20240418061053.96803-1-guanrui.huang@linux.alibaba.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240417_231116_326777_5D4616DB X-CRM114-Status: UNSURE ( 9.08 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org In its_vpe_irq_domain_alloc, when its_vpe_init() returns an error with i > 0, its_vpe_irq_domain_free may free bitmap and vprop_page, and then there is a double free in its_vpe_irq_domain_alloc. Fix it by calling its_vpe_irq_domain_free directly, bitmap and vprop_page will be freed in this function. Fixes: 7d75bbb4bc1a ("irqchip/gic-v3-its: Add VPE irq domain allocation/teardown") Reviewed-by: Marc Zyngier Reviewed-by: Zenghui Yu Signed-off-by: Guanrui Huang --- drivers/irqchip/irq-gic-v3-its.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/drivers/irqchip/irq-gic-v3-its.c b/drivers/irqchip/irq-gic-v3-its.c index fca888b36680..2305f6b524a9 100644 --- a/drivers/irqchip/irq-gic-v3-its.c +++ b/drivers/irqchip/irq-gic-v3-its.c @@ -4561,13 +4561,8 @@ static int its_vpe_irq_domain_alloc(struct irq_domain *domain, unsigned int virq irqd_set_resend_when_in_progress(irq_get_irq_data(virq + i)); } - if (err) { - if (i > 0) - its_vpe_irq_domain_free(domain, virq, i); - - its_lpi_free(bitmap, base, nr_ids); - its_free_prop_table(vprop_page); - } + if (err) + its_vpe_irq_domain_free(domain, virq, i); return err; }