From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 2792D39DBCF for ; Mon, 20 Jul 2026 08:50:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784537415; cv=none; b=XmSXIeo3vJEExpnA+QF42s+g93dex3L3X1acFUPZQi+PFEgbtqaCgh5dDMxwxaFkSyD25JerBxfvAXvd9U7RBvNN8xy617GMVjlkUZ8u5bmCh7X7/e4wtArJHpB2uanurlrd//kDjlMXa5rOZ8lysPvosxj/isDnLeTUdxrCBJM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784537415; c=relaxed/simple; bh=M5Ds+J9JuHRTn7WmgjZcqEo8G7Et/+UVPOKqCCm6o7o=; h=Date:Message-ID:From:To:Cc:Subject:In-Reply-To:References: MIME-Version:Content-Type; b=rGuHi0dMIDc5SMVMkgQ8aFwdOLVwm+oy+kONrWU/ZVxSGCRQ6CnaL1s6ds5s/S3mE4r8IOij3LVeyNOZXlBD+HWlTU0fEnJs1CpMNTelLO08jlwggY5uMoiSepxxjyHQTqq5I29LE1Xw4mmHjFMJW5AjXIGSL1Amyx4+BKkkq9A= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=W6+7GQnT; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="W6+7GQnT" Received: by smtp.kernel.org (Postfix) with ESMTPSA id F10581F00A3A; Mon, 20 Jul 2026 08:50:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1784537414; bh=dQb+2X9nWD1OWaKa2Fs9dIHuK0dsQwtZUMEcjYtHnmE=; h=Date:From:To:Cc:Subject:In-Reply-To:References; b=W6+7GQnTvp/U1tBNUQLniJ8G1ZlpIRwtoo8U0EHTZXI2umyhL9DeCua9HLScuT66u pfzjTnynk8iVURi/ZXFnF+k0fiFS4MeSobSeLVXmC6ZI+Mtm+Xaqvz8fhPDay8OfBv +mGONREH7LHi6RH3ZDqnpEFFYGiSTN5usVx2LqP6woyo5aaWw4wu8P47Kqw85mhXiS Dw+IluOBtOwHi/j85QNRuHDDbF7FzgM2ZbreRIVO+jW5zQ9W50bw5GIOYeaVUusaJl 6yxD5LKZ3xiHvkOi5LtVTHLJXIJ0kKJnvpaQPSUUMqAY8Q3IanXaoSPLWCaZYBSKLX Pk2HKjjBy4Duw== Received: from sofa.misterjones.org ([185.219.108.64] helo=goblin-girl.misterjones.org) by disco-boy.misterjones.org with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.98.2) (envelope-from ) id 1wljhT-00000006hya-30L6; Mon, 20 Jul 2026 08:50:11 +0000 Date: Mon, 20 Jul 2026 09:50:00 +0100 Message-ID: <86a4rmf3k7.wl-maz@kernel.org> From: Marc Zyngier To: Kemeng Shi Cc: tglx@kernel.org, jason@lakedaemon.net, lpieralisi@kernel.org, radu@rendec.net, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v5 3/4] irqchip/gic-v3-its: Fix leak in its_vpe_irq_domain_alloc() In-Reply-To: <20260720071215.50705-4-shikemeng@huaweicloud.com> References: <20260720071215.50705-1-shikemeng@huaweicloud.com> <20260720071215.50705-4-shikemeng@huaweicloud.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/30.1 (aarch64-unknown-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: shikemeng@huaweicloud.com, tglx@kernel.org, jason@lakedaemon.net, lpieralisi@kernel.org, radu@rendec.net, 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 Mon, 20 Jul 2026 08:12:14 +0100, Kemeng Shi wrote: > > When its_irq_gic_domain_alloc() fails, the following > its_vpe_irq_domain_free() skips calling its_vep_teardown() for the > corresponding irq. Try its_vpe_teardown() in error handling to avoid > the leak issue. > > Fixes: 7d75bbb4bc1ad ("irqchip/gic-v3-its: Add VPE irq domain allocation/teardown") > Signed-off-by: Kemeng Shi > --- > drivers/irqchip/irq-gic-v3-its.c | 12 ++++++++---- > 1 file changed, 8 insertions(+), 4 deletions(-) > > diff --git a/drivers/irqchip/irq-gic-v3-its.c b/drivers/irqchip/irq-gic-v3-its.c > index 3e4edcb64065..5dc91862fc15 100644 > --- a/drivers/irqchip/irq-gic-v3-its.c > +++ b/drivers/irqchip/irq-gic-v3-its.c > @@ -4594,9 +4594,11 @@ static int its_vpe_init(struct its_vpe *vpe) > > static void its_vpe_teardown(struct its_vpe *vpe) > { > - its_vpe_db_proxy_unmap(vpe); > - its_vpe_id_free(vpe->vpe_id); > - its_free_pending_table(vpe->vpt_page); > + if (vpe->vpt_page != NULL) { > + its_vpe_db_proxy_unmap(vpe); > + its_vpe_id_free(vpe->vpe_id); > + its_free_pending_table(vpe->vpt_page); > + } Please keep the diff minimal by doing an early return. This also deserves a comment, because this is not completely obvious: diff --git a/drivers/irqchip/irq-gic-v3-its.c b/drivers/irqchip/irq-gic-v3-its.c index 6f5811aae59c1..38032067135b6 100644 --- a/drivers/irqchip/irq-gic-v3-its.c +++ b/drivers/irqchip/irq-gic-v3-its.c @@ -4592,6 +4592,13 @@ static int its_vpe_init(struct its_vpe *vpe) static void its_vpe_teardown(struct its_vpe *vpe) { + /* + * If vpt_page is NULL, then its_vpe_init() has failed, and + * there is nothing to do as no resource has been allocated. + */ + if (!vpe->vpt_page) + return; + its_vpe_db_proxy_unmap(vpe); its_vpe_id_free(vpe->vpe_id); its_free_pending_table(vpe->vpt_page); M. -- Without deviation from the norm, progress is not possible.