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 1672536D500; Tue, 6 Jan 2026 17:59:24 +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=1767722364; cv=none; b=cior5yDEqvWKyCJGdQx8V2Ys9WkBwFiZiNvKoZHvnaRx03Mgik16l71l6KBIW8mBEcqQr2Ibn2iVh4HFc+34LD5yoJh6y3KCdtDuFo5oD1bNgBLnYdyuGnV8HFnTFj+iyWKdeOKdO6eZTNWOBgSDFxfNSS8xIpSzkgSVs29wUnM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767722364; c=relaxed/simple; bh=uytIz0RtONs4ubJlxWAfVHsJHFm75GCjXB8Wb4UlAAE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=LxKKt8RoLUU9Vf3ftPxjjNtdMjLi+pCMIn9TgateVe5tNwz046qajcSe4PdHqfRfYUbhsAmxNj+62jtzWJdSkcoqKKlJ3ct+Ok9Fy/TRWRUNsBOSYGdZ5Q6q/LfGQWidguFVwYVH/NL/vSRIdicT3ExeYri8W5GCUWTZlA4qgcg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=1tBoM9yB; 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="1tBoM9yB" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 78B84C116C6; Tue, 6 Jan 2026 17:59:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1767722364; bh=uytIz0RtONs4ubJlxWAfVHsJHFm75GCjXB8Wb4UlAAE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1tBoM9yBah2hWO+GYmTbJAEMS71Qmo7vfQLw9pnddV+iKfIk8a3jUbmt/5M36x1Bz CUQql//F+SzIHGWBG3GAWIuTUg0us09B2PERClIzYABBipXeDSBAFFndNdeQ4dSzqf 0I8wt+b1bt8q3e587UX2ZEGAyP+ThY1aYzC9NGP0= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Haoxiang Li , Simon Horman , Paolo Abeni Subject: [PATCH 6.18 243/312] fjes: Add missing iounmap in fjes_hw_init() Date: Tue, 6 Jan 2026 18:05:17 +0100 Message-ID: <20260106170556.641559193@linuxfoundation.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260106170547.832845344@linuxfoundation.org> References: <20260106170547.832845344@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Haoxiang Li commit 15ef641a0c6728d25a400df73922e80ab2cf029c upstream. In error paths, add fjes_hw_iounmap() to release the resource acquired by fjes_hw_iomap(). Add a goto label to do so. Fixes: 8cdc3f6c5d22 ("fjes: Hardware initialization routine") Cc: stable@vger.kernel.org Signed-off-by: Haoxiang Li Signed-off-by: Simon Horman Reviewed-by: Simon Horman Link: https://patch.msgid.link/20251211073756.101824-1-lihaoxiang@isrc.iscas.ac.cn Signed-off-by: Paolo Abeni Signed-off-by: Greg Kroah-Hartman --- drivers/net/fjes/fjes_hw.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) --- a/drivers/net/fjes/fjes_hw.c +++ b/drivers/net/fjes/fjes_hw.c @@ -334,7 +334,7 @@ int fjes_hw_init(struct fjes_hw *hw) ret = fjes_hw_reset(hw); if (ret) - return ret; + goto err_iounmap; fjes_hw_set_irqmask(hw, REG_ICTL_MASK_ALL, true); @@ -347,8 +347,10 @@ int fjes_hw_init(struct fjes_hw *hw) hw->max_epid = fjes_hw_get_max_epid(hw); hw->my_epid = fjes_hw_get_my_epid(hw); - if ((hw->max_epid == 0) || (hw->my_epid >= hw->max_epid)) - return -ENXIO; + if ((hw->max_epid == 0) || (hw->my_epid >= hw->max_epid)) { + ret = -ENXIO; + goto err_iounmap; + } ret = fjes_hw_setup(hw); @@ -356,6 +358,10 @@ int fjes_hw_init(struct fjes_hw *hw) hw->hw_info.trace_size = FJES_DEBUG_BUFFER_SIZE; return ret; + +err_iounmap: + fjes_hw_iounmap(hw); + return ret; } void fjes_hw_exit(struct fjes_hw *hw)