From nobody Sun Dec 14 06:37:05 2025 Received: from cstnet.cn (smtp81.cstnet.cn [159.226.251.81]) (using TLSv1.2 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 23B342D3237; Thu, 11 Dec 2025 07:38:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=159.226.251.81 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765438713; cv=none; b=Ij5/0N97vqZfSVepuyEuKHR0/ibe0oCCLGHpEBe/kzU21cr2og3FsZqRFvlWqBF2ds8yMFMnNa2I1WxmyG93zF9l/VLeJt9+xbPogiN+zEp+Yr+te9aC2KVv22RagaTLTlqOyfMjB+OpedhPxuH6aXAAu6PDmnKioVchN/UK8GY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765438713; c=relaxed/simple; bh=MyU/EXJW3Oa3f5V78Uft2sD9r17cnuRAzdb3bovzUUY=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=XXsMjNAh0ZI3nl9BFxYXxo2sW+rgFs3onXLkEz3CTyvB85BOa01HsR3w+XDURsYlKu7mA0TKfojk9BTBGm02wicdU24vpCsKJyakIrRXxXoxw0YBWnv8XXRT5qMip5s5G6bYsG26p0FeYvkrtt6h2SwY2OIQ3krOVC8ZFs357Vw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=isrc.iscas.ac.cn; spf=pass smtp.mailfrom=isrc.iscas.ac.cn; arc=none smtp.client-ip=159.226.251.81 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=isrc.iscas.ac.cn Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=isrc.iscas.ac.cn Received: from localhost.localdomain (unknown [36.112.3.239]) by APP-03 (Coremail) with SMTP id rQCowABnTOPXdDpptCJIAA--.16140S2; Thu, 11 Dec 2025 15:38:00 +0800 (CST) From: Haoxiang Li To: andrew+netdev@lunn.ch, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, izumi.taku@jp.fujitsu.com Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Haoxiang Li , stable@vger.kernel.org, Simon Horman Subject: [PATCH v2] fjes: Add missing iounmap in fjes_hw_init() Date: Thu, 11 Dec 2025 15:37:56 +0800 Message-Id: <20251211073756.101824-1-lihaoxiang@isrc.iscas.ac.cn> X-Mailer: git-send-email 2.25.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: rQCowABnTOPXdDpptCJIAA--.16140S2 X-Coremail-Antispam: 1UD129KBjvJXoW7WrW3ur4fGw13Zr48GFy3urg_yoW8XFW8pF yUu3s3ArZxJF4UXw1xAF4fZFyaya4xGry5C3y7Cw1fJwn0vF1ay3WrCa1IvrZ8KrykXFya 9Fn8Aw15uF1DZa7anT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUU9014x267AKxVW8JVW5JwAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWUWVWUuwAFIxvE14AKwVWUJVWUGwA2ocxC64kIII0Yj41l84x0c7CEw4AK67xGY2AK02 1l84ACjcxK6xIIjxv20xvE14v26r1j6r1xM28EF7xvwVC0I7IYx2IY6xkF7I0E14v26r4j 6F4UM28EF7xvwVC2z280aVAFwI0_Jr0_Gr1l84ACjcxK6I8E87Iv6xkF7I0E14v26r4j6r 4UJwAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0 I7IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCaFVCjc4AY6r1j6r 4UM4x0Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2IErcIFxwACI402YVCY1x02628v n2kIc2xKxwCY1x0262kKe7AKxVWUtVW8ZwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7x kEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E 67AF67kF1VAFwI0_Jw0_GFylIxkGc2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVWUJVWUCw CI42IY6xIIjxv20xvEc7CjxVAFwI0_Gr0_Cr1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r1x MIIF0xvEx4A2jsIE14v26r1j6r4UMIIF0xvEx4A2jsIEc7CjxVAFwI0_Gr0_Gr1UYxBIda VFxhVjvjDU0xZFpf9x0JUd-B_UUUUU= X-CM-SenderInfo: 5olkt0x0ld0ww6lv2u4olvutnvoduhdfq/1tbiBwsME2k5OmMfvwABs7 Content-Type: text/plain; charset="utf-8" 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 --- Changes in v2: - Use an idiomatic goto to do the error hanlding. - Thanks for pointing out the issues with the patch, Simon! --- drivers/net/fjes/fjes_hw.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/drivers/net/fjes/fjes_hw.c b/drivers/net/fjes/fjes_hw.c index b9b5554ea862..5ad2673f213d 100644 --- 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) =20 ret =3D fjes_hw_reset(hw); if (ret) - return ret; + goto err_iounmap; =20 fjes_hw_set_irqmask(hw, REG_ICTL_MASK_ALL, true); =20 @@ -347,8 +347,10 @@ int fjes_hw_init(struct fjes_hw *hw) hw->max_epid =3D fjes_hw_get_max_epid(hw); hw->my_epid =3D fjes_hw_get_my_epid(hw); =20 - if ((hw->max_epid =3D=3D 0) || (hw->my_epid >=3D hw->max_epid)) - return -ENXIO; + if ((hw->max_epid =3D=3D 0) || (hw->my_epid >=3D hw->max_epid)) { + ret =3D -ENXIO; + goto err_iounmap; + } =20 ret =3D fjes_hw_setup(hw); =20 @@ -356,6 +358,10 @@ int fjes_hw_init(struct fjes_hw *hw) hw->hw_info.trace_size =3D FJES_DEBUG_BUFFER_SIZE; =20 return ret; + +err_iounmap: + fjes_hw_iounmap(hw); + return ret; } =20 void fjes_hw_exit(struct fjes_hw *hw) --=20 2.25.1