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 F1A5622E3F0; Wed, 4 Feb 2026 15:08:11 +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=1770217692; cv=none; b=WPxuUhzspem04d033sr0+cLSHZUB6M85XXi4sgk2oZ57u6g/daGCWoeyu7veo+S8g3xi/3NasKdCumHw5FaAN1ChOvmUbURYMla8/1uDfHEGX9FIkLrfdsrZd5eovkTNfwk36oDvYkxJXEyXghr1HZC6JIOA/2Y7nmwRFRAY8CU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770217692; c=relaxed/simple; bh=y84wtPCTuDhOnidAVnaXd4ecnRcQjgMa2XzKz1EeDxg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=YFbktUC9jSUmk2Hd669wd7J3pLkwZiBkQ1W529y+x0I8pq0osEMQ7TQvjZc4XsdjohcpqyfIY9kwn+lOEosyuHrGjaysxsIaPlQfITOyYosbMGNVoBB2JsO0vsWOIrvsBcePw/XGymw1533XwVtjNW3i71+EgNE6MZonk52KMW8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=FnLHlPMy; 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="FnLHlPMy" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 15FBAC4CEF7; Wed, 4 Feb 2026 15:08:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1770217691; bh=y84wtPCTuDhOnidAVnaXd4ecnRcQjgMa2XzKz1EeDxg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FnLHlPMyBsKPQG6+1pEWT2jV3M6BNzmNrsikkI2V24uIz3gB83As3qekUlQREdgbj uimDxdLQmeUqtt6tRgPElKfi84Ifzr7OMhbQGwoAc4p52WhRf4Ngf3AvZxTmfAgsCE HMC5zao75EB43k7TCmMu2vnS4PiDULU/IwgC2O7k= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Haoxiang Li , "Borislav Petkov (AMD)" Subject: [PATCH 6.1 056/280] EDAC/i3200: Fix a resource leak in i3200_probe1() Date: Wed, 4 Feb 2026 15:37:10 +0100 Message-ID: <20260204143911.666484031@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260204143909.614719725@linuxfoundation.org> References: <20260204143909.614719725@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.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Haoxiang Li commit d42d5715dcb559342ff356327b241c53a67584d9 upstream. If edac_mc_alloc() fails, also unmap the window. [ bp: Use separate labels, turning it into the classic unwind pattern. ] Fixes: dd8ef1db87a4 ("edac: i3200 memory controller driver") Signed-off-by: Haoxiang Li Signed-off-by: Borislav Petkov (AMD) Cc: stable@vger.kernel.org Link: https://patch.msgid.link/20251223123202.1492038-1-lihaoxiang@isrc.iscas.ac.cn Signed-off-by: Greg Kroah-Hartman --- drivers/edac/i3200_edac.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) --- a/drivers/edac/i3200_edac.c +++ b/drivers/edac/i3200_edac.c @@ -358,10 +358,11 @@ static int i3200_probe1(struct pci_dev * layers[1].type = EDAC_MC_LAYER_CHANNEL; layers[1].size = nr_channels; layers[1].is_virt_csrow = false; - mci = edac_mc_alloc(0, ARRAY_SIZE(layers), layers, - sizeof(struct i3200_priv)); + + rc = -ENOMEM; + mci = edac_mc_alloc(0, ARRAY_SIZE(layers), layers, sizeof(struct i3200_priv)); if (!mci) - return -ENOMEM; + goto unmap; edac_dbg(3, "MC: init mci\n"); @@ -421,9 +422,9 @@ static int i3200_probe1(struct pci_dev * return 0; fail: + edac_mc_free(mci); +unmap: iounmap(window); - if (mci) - edac_mc_free(mci); return rc; }