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 6A4523370E6; Fri, 17 Oct 2025 15:15:10 +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=1760714110; cv=none; b=WrbekPcCK9MXvyvETnNq7L50b8EIh4F6I5m1CArwjUx+BWutLnb4aCnflSCR7F6eZeM7mxLQz/ILsIV1LWmtiumQdMWR36E/1Nwns2x8XPX4gJevs0fuuzIaEdMSYunJOOMwXWPalXlpXxYWFuzCYy7HPGpu177U/PJKfcy3uHM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760714110; c=relaxed/simple; bh=R9BbaoMpQ3oENytQDE/ipZXqYgce2Qgr+zc6zxJm644=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=i1jAp5A49SWRMQVLt8jNI8SCLwMkWFs9nDrmEqiRo4jMrwTiUtEmM2YvRR2ufK5Q48ScVUNoPwaMSbefgJcL6PEbOFqPbbuOtzR/vgW805OrpL0d4Tw2CkbkhyIuI3YesvrEHWj2tJ0nsfZpzG5YgvhM3CxHGpyKFrT6NzBVbng= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=RDnTD2uZ; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="RDnTD2uZ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id EBB4FC4CEE7; Fri, 17 Oct 2025 15:15:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1760714110; bh=R9BbaoMpQ3oENytQDE/ipZXqYgce2Qgr+zc6zxJm644=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RDnTD2uZNtmVvJ+bmXb2wTSlAJqiP5x2yWHmImzQVdHV+VFYBSjrkEv3ye5KDkMMp Q/qVAq5LvgPiXK5VCa8/SJb2KudjdyGiLxa05VimTlLzZTc6Q/iYlQNiG26aFunzm3 4IE+XmmfLRsHBFeZfzwk0R6i4I5FhE2vf+9SpZmw= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Zhen Ni , Daniel Lezcano Subject: [PATCH 6.12 006/277] clocksource/drivers/clps711x: Fix resource leaks in error paths Date: Fri, 17 Oct 2025 16:50:13 +0200 Message-ID: <20251017145147.378206349@linuxfoundation.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251017145147.138822285@linuxfoundation.org> References: <20251017145147.138822285@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Zhen Ni commit cd32e596f02fc981674573402c1138f616df1728 upstream. The current implementation of clps711x_timer_init() has multiple error paths that directly return without releasing the base I/O memory mapped via of_iomap(). Fix of_iomap leaks in error paths. Fixes: 04410efbb6bc ("clocksource/drivers/clps711x: Convert init function to return error") Fixes: 2a6a8e2d9004 ("clocksource/drivers/clps711x: Remove board support") Signed-off-by: Zhen Ni Signed-off-by: Daniel Lezcano Cc: stable@vger.kernel.org Link: https://lore.kernel.org/r/20250814123324.1516495-1-zhen.ni@easystack.cn Signed-off-by: Greg Kroah-Hartman --- drivers/clocksource/clps711x-timer.c | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) --- a/drivers/clocksource/clps711x-timer.c +++ b/drivers/clocksource/clps711x-timer.c @@ -78,24 +78,33 @@ static int __init clps711x_timer_init(st unsigned int irq = irq_of_parse_and_map(np, 0); struct clk *clock = of_clk_get(np, 0); void __iomem *base = of_iomap(np, 0); + int ret = 0; if (!base) return -ENOMEM; - if (!irq) - return -EINVAL; - if (IS_ERR(clock)) - return PTR_ERR(clock); + if (!irq) { + ret = -EINVAL; + goto unmap_io; + } + if (IS_ERR(clock)) { + ret = PTR_ERR(clock); + goto unmap_io; + } switch (of_alias_get_id(np, "timer")) { case CLPS711X_CLKSRC_CLOCKSOURCE: clps711x_clksrc_init(clock, base); break; case CLPS711X_CLKSRC_CLOCKEVENT: - return _clps711x_clkevt_init(clock, base, irq); + ret = _clps711x_clkevt_init(clock, base, irq); + break; default: - return -EINVAL; + ret = -EINVAL; + break; } - return 0; +unmap_io: + iounmap(base); + return ret; } TIMER_OF_DECLARE(clps711x, "cirrus,ep7209-timer", clps711x_timer_init);