From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B467A2FFDC2 for ; Wed, 13 Aug 2025 12:14:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.53 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755087273; cv=none; b=qOnPZIX81OptcBk4cyf05t61PIhMbFN3ZmS/cN8ci1flbzivI0YlLtFeRANo0TjNTYfZwdRdlfU8RVTF2QgR0Tp+3DhaIS9gZQxqvgPM6qr/40lWw4h4J28ebtbZi/vUcbf4qKxLzbKTKS/b+2wkh9surTuEGYhToGiRFMgQ4KQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755087273; c=relaxed/simple; bh=E+nYtUgvkEArHsW/dU2G+LfJN2FbpyML8f1ME6KvyzM=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=NG0OAVISuWZLq0i87/hZT4y2Xx/d74+hRPDUWVaVvswsITzNI68fx+It7L6vZTDBep9hAhKuBknX7tYlxaoErYC+nTyQn/iOvCc9P217hDl/plZS4dugsYvqtJXQcSKshhSsuw9aS9kGTbOHSPjU9VOMZuWQkyxbETGSmxqCxAE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=j8VrFzic; arc=none smtp.client-ip=209.85.221.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="j8VrFzic" Received: by mail-wr1-f53.google.com with SMTP id ffacd0b85a97d-3b7825e2775so5952846f8f.2 for ; Wed, 13 Aug 2025 05:14:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1755087270; x=1755692070; darn=vger.kernel.org; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=jeq4CBdJ33eLGBPTAe/oKglbRxjRK0CysJMq7Q73p2c=; b=j8VrFzicFRxsgvv9gLzFDpEehap5s/Odi/7tMwmkdsY/lDoIkr/jYPoVRvRmyGY4tq LBGQICT65LSCQCcdz9WtofphSGmmvyIEjUVcHQzrtcLSOBoNuK5m0fQdC91g0n/qhdya gZzuHpfFoC5yEO/vAEfFs0+Tlgq9etUsiAwUR1NBWK8eAEKtCOfTFfl0KGdoPx8i95lp T6HAmrEbk6qPD8OApmygFWpHUdVZNRTw/ODOhoaicCYhuVjRVHwV7jRw/Y57jUiJ7kPX t89fRw/gO3VvhMZ3chxvrgVuCHcMnAvNYmfQBYbGg5RBAXxHfFI48n+L/EEtBDVZ0hKn 0esQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755087270; x=1755692070; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=jeq4CBdJ33eLGBPTAe/oKglbRxjRK0CysJMq7Q73p2c=; b=dM0fc5VoyaBdtSzjbVnQs+t5a2iGAhdOCzDv6TRVNrOuqksIvY9TxeK85hg7gK7UNw eEkgKy/aEvwA0RZZOz5aSvEo0sA36ORTkB+oaonBvG/B/HBIYekPSZBZWXNZ6+Or7baD UyGefjtC1QdomeoTki9mnB2tejc0UrCi3COOxQtPx4cfPxCQJutfCx+8CpZEADsoWqAD 7S0uAVPk/Kp9T+bMnZ8w4yxg9Lt4T+MI7GFPkFqX43qYgxOliI3ksGggK3WT3ANIHL9K OFNllf/d1Yg9ItOqbeRkBwfbSEAbXgk135ZhrEfgjF1daz21OEUvX8Tih2x0feQprx17 vEtQ== X-Forwarded-Encrypted: i=1; AJvYcCVNSZA2NbLMpeIuHzHbxhbJTKBLG+01Ug3g8oTY52lpyIrMxEdpWxprc93BffUbOmZbR9xt/uE=@vger.kernel.org X-Gm-Message-State: AOJu0YzB7Z9n30lN6xxRRY4j987DaeVMEJF8u223fmg+ObDhrXC5eYL3 fjImZSEz0hXp+4+2tIe9lp7fjf2kwqxxxSn2jJ4Qk5w1J+hifn1saojK4TKRoNp00eX5Wqko1D/ aRakg X-Gm-Gg: ASbGnctIOH+X/VgQuS7M0hSDkXvHaJcc4eLfa+RtbJyEHeMsJH5GnWnO+l2b1o6FwQT IY0EhHqmcCpGeseq5uZNxnoV0kvQJdqqtrAeP1OAASuTatx4OmYHU3tdeJwEuwkfis55qDdDzK0 xJmrWk6vU4x9KXw7pR9ZwuI+JBtXeBFVaS/ZdBPDNX1Z5IeEEEaM9jl4ZLyMQH0/S1DgC6MsfS8 ZmgNnGWMAwDMvnIU4rGxR+Ekzv/tS0Uhob+tD41/b2scB9um56x/OhPxv0LaJyvsTIoy2wdaM5Z erEFXZ3Dm0inTLLQ7IBl8qXoZy1z9xpG+QQyZrRAjLw40iHfwWd0qAU0opvp5JfXOKz9shHO6pG r1vwltkoc7eVDwbEhM2FfGEqsLRd+uDMtzE2GLsmNOM4XBNFceIOMtr59e0pSdQ== X-Google-Smtp-Source: AGHT+IHyp5XaCkuQeKAOWVK1H9tvy5xzJIEf5fUFD7JJ1dWWbo0bB0dFlilKV9z5VjkTyX2ZutLksA== X-Received: by 2002:a5d:5c84:0:b0:3b7:88f5:eaae with SMTP id ffacd0b85a97d-3b917ec375cmr2297214f8f.39.1755087270033; Wed, 13 Aug 2025 05:14:30 -0700 (PDT) Received: from [192.168.10.46] (146725694.box.freepro.com. [130.180.211.218]) by smtp.googlemail.com with ESMTPSA id ffacd0b85a97d-3b79c489e81sm48090940f8f.68.2025.08.13.05.14.29 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 13 Aug 2025 05:14:29 -0700 (PDT) Message-ID: <395ffd35-65ef-44e7-82ee-25cd64ea4111@linaro.org> Date: Wed, 13 Aug 2025 14:14:28 +0200 Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v3] clocksource: clps711x: Fix resource leaks in error paths To: Zhen Ni , Markus.Elfring@web.de, tglx@linutronix.de Cc: linux-kernel@vger.kernel.org, stable@vger.kernel.org References: <20250804123619.78282-1-zhen.ni@easystack.cn> <20250805035637.169422-1-zhen.ni@easystack.cn> Content-Language: en-US From: Daniel Lezcano In-Reply-To: <20250805035637.169422-1-zhen.ni@easystack.cn> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Hi, this patch does not seem to have reached lkml@, making impossible to extract via git b4 neither adding the Link tag. On 05/08/2025 05:56, Zhen Ni wrote: > 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") > Cc: stable@vger.kernel.org > Signed-off-by: Zhen Ni > --- > changes in v3: > - Change "err" to "error" in the commit message. > changes in v2: > - Add tags of 'Fixes' and 'Cc' > - Reduce detailed enumeration of err paths > - Omit a pointer check before iounmap() > - Change goto target from out to unmap_io > --- > drivers/clocksource/clps711x-timer.c | 23 ++++++++++++++++------- > 1 file changed, 16 insertions(+), 7 deletions(-) > > diff --git a/drivers/clocksource/clps711x-timer.c b/drivers/clocksource/clps711x-timer.c > index e95fdc49c226..bbceb0289d45 100644 > --- a/drivers/clocksource/clps711x-timer.c > +++ b/drivers/clocksource/clps711x-timer.c > @@ -78,24 +78,33 @@ static int __init clps711x_timer_init(struct device_node *np) > 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); -- Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog