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 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 250D0C4345F for ; Sat, 13 Apr 2024 08:44:54 +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: Subject:Cc:To:From:Message-ID:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=xn1GrKa0K0OlPPf5s1PFVECs7CPhS+W2QDIjmbiNlgc=; b=kkX0LYMhPNMCSf Psc4Uoz+/xM3sNw5wJs56+Gfp4uboCtyrYvuAs4YtjaFuisjYASaOXwqe+PXnIDEg7WorEM4FcuPV KzTIhrjf+EgQF7ZMjRkm9uLg1IcCv4tr+ykRQFc+FCZhirGwzZmnPxuovDG7IQul9RnDLFchY/PLG zSCYoE4cGwEHuAJbkQNyZL8b+XMCNkOWvsWmGI1dQmK1MYFEk43LLuM1XoVDuIW9yOQkELcJfjWue 2JzDdQqfWBEt0yp4Hy1Zr10zE8CCpq5dg7vpiNHiOVl5JhA+Xx+YkK/3ZqMddcQXtwRg5N5E/nKHc oVEvXPK63/tThOcWku6g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rvZ08-00000002ljK-3MGv; Sat, 13 Apr 2024 08:44:44 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rvZ06-00000002lig-1pm8 for linux-arm-kernel@lists.infradead.org; Sat, 13 Apr 2024 08:44:43 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id E7C8E6162C; Sat, 13 Apr 2024 08:44:41 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 92AEDC113CD; Sat, 13 Apr 2024 08:44:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1712997881; bh=/wLGnoIeoo4W2cyvTVt18c7gw15g1e4ZJjlq9J58C44=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=Sk8IayQqtx9l/zyO0uiI3pKkotGl+asOUMuEwZ1h3+9pFDkJ7d/JK4Tg90tR5vMka hoXdKG7G66aAjEDID4Scaza6Tc0Man5HkljhsvrWWTgtWyM87132XLk/pTeMSiBWW+ MJ3uLt+ISEXxjy7gfljbKhak0RBlDoSQSLJSOvcQ1Rifn2eDGps9KPttj+8bhd+WI1 nTbx4Y3JWx8+PdJzMoIm8Bib19qpU9c+PfgptPIf0MSm+YXudxo0S6OwtUcdTxsqyc WbDhonz+uWQs5KtwYyzkmWgeziznjzK8M+Jg4loTwPtXNuo4PV/NEflxkCGXv7sUyJ 3aqjFtAanVoRA== Received: from sofa.misterjones.org ([185.219.108.64] helo=wait-a-minute.misterjones.org) by disco-boy.misterjones.org with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1rvZ03-0046hp-8L; Sat, 13 Apr 2024 09:44:39 +0100 Date: Sat, 13 Apr 2024 09:44:42 +0100 Message-ID: <877ch1slc5.wl-maz@kernel.org> From: Marc Zyngier To: Guanrui Huang Cc: yuzenghui@huawei.com, shannon.zhao@linux.alibaba.com, tglx@linutronix.de, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v4 1/2] irqchip/gic-v3-its: Fix double free on error In-Reply-To: <20240413064051.31315-1-guanrui.huang@linux.alibaba.com> References: <20240413064051.31315-1-guanrui.huang@linux.alibaba.com> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI-EPG/1.14.7 (Harue) FLIM-LB/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL-LB/10.8 EasyPG/1.0.0 Emacs/28.2 (x86_64-pc-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") X-SA-Exim-Connect-IP: 185.219.108.64 X-SA-Exim-Rcpt-To: guanrui.huang@linux.alibaba.com, yuzenghui@huawei.com, shannon.zhao@linux.alibaba.com, tglx@linutronix.de, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org X-SA-Exim-Mail-From: maz@kernel.org X-SA-Exim-Scanned: No (on disco-boy.misterjones.org); SAEximRunCond expanded to false X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240413_014442_556975_44BD03D0 X-CRM114-Status: GOOD ( 20.24 ) 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: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Sat, 13 Apr 2024 07:40:50 +0100, Guanrui Huang wrote: > > 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. > > 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; > } Reviewed-by: Marc Zyngier M. -- Without deviation from the norm, progress is not possible. _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 137DE3D544 for ; Sat, 13 Apr 2024 08:44:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712997882; cv=none; b=YGVyLrMtnVNLdSjqwZoKwKExBnVP5mxnstH5CK2eI5BilX2hJt2BfUcJazmV4cnpTRp8omRHPnbTiVHNhwpuls30PsXGpLp1BLFBbYVJO8ZYcVwXlSiOg/xToRpe5XeGHtcNzbcpA5FzKEToWvN16M6pBoNQUPfCnqGv0EmgpUo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712997882; c=relaxed/simple; bh=/wLGnoIeoo4W2cyvTVt18c7gw15g1e4ZJjlq9J58C44=; h=Date:Message-ID:From:To:Cc:Subject:In-Reply-To:References: MIME-Version:Content-Type; b=d+ALUS1MeS73BDWUjE5gIPGCS+bm4cj9/lU4Px6l3tUH7dOwGXOSIKwBDvYnImOXoYwk4JHMofB4Y5+a46eUfPVM1XBb7eJ447gNUvdiKeqbZIJ96JooSSn8xRrV2HEWyj9B3Vs7z2+lLI4ds22L1Yk/3elHpMaOQ1TOwkY8JxY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Sk8IayQq; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Sk8IayQq" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 92AEDC113CD; Sat, 13 Apr 2024 08:44:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1712997881; bh=/wLGnoIeoo4W2cyvTVt18c7gw15g1e4ZJjlq9J58C44=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=Sk8IayQqtx9l/zyO0uiI3pKkotGl+asOUMuEwZ1h3+9pFDkJ7d/JK4Tg90tR5vMka hoXdKG7G66aAjEDID4Scaza6Tc0Man5HkljhsvrWWTgtWyM87132XLk/pTeMSiBWW+ MJ3uLt+ISEXxjy7gfljbKhak0RBlDoSQSLJSOvcQ1Rifn2eDGps9KPttj+8bhd+WI1 nTbx4Y3JWx8+PdJzMoIm8Bib19qpU9c+PfgptPIf0MSm+YXudxo0S6OwtUcdTxsqyc WbDhonz+uWQs5KtwYyzkmWgeziznjzK8M+Jg4loTwPtXNuo4PV/NEflxkCGXv7sUyJ 3aqjFtAanVoRA== Received: from sofa.misterjones.org ([185.219.108.64] helo=wait-a-minute.misterjones.org) by disco-boy.misterjones.org with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1rvZ03-0046hp-8L; Sat, 13 Apr 2024 09:44:39 +0100 Date: Sat, 13 Apr 2024 09:44:42 +0100 Message-ID: <877ch1slc5.wl-maz@kernel.org> From: Marc Zyngier To: Guanrui Huang Cc: yuzenghui@huawei.com, shannon.zhao@linux.alibaba.com, tglx@linutronix.de, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v4 1/2] irqchip/gic-v3-its: Fix double free on error In-Reply-To: <20240413064051.31315-1-guanrui.huang@linux.alibaba.com> References: <20240413064051.31315-1-guanrui.huang@linux.alibaba.com> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI-EPG/1.14.7 (Harue) FLIM-LB/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL-LB/10.8 EasyPG/1.0.0 Emacs/28.2 (x86_64-pc-linux-gnu) MULE/6.0 (HANACHIRUSATO) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: text/plain; charset=US-ASCII X-SA-Exim-Connect-IP: 185.219.108.64 X-SA-Exim-Rcpt-To: guanrui.huang@linux.alibaba.com, yuzenghui@huawei.com, shannon.zhao@linux.alibaba.com, tglx@linutronix.de, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org X-SA-Exim-Mail-From: maz@kernel.org X-SA-Exim-Scanned: No (on disco-boy.misterjones.org); SAEximRunCond expanded to false On Sat, 13 Apr 2024 07:40:50 +0100, Guanrui Huang wrote: > > 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. > > 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; > } Reviewed-by: Marc Zyngier M. -- Without deviation from the norm, progress is not possible.