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 27C0F3BBA1F; Wed, 21 Jan 2026 18:32:36 +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=1769020356; cv=none; b=JAQWLBnBWmlrwmpfY6Xp4RF3yD8Q4EyW7rnkAKB/8adFCu+7si0jv+O/Ry0ag0n8ka558sFjI6zIdqXCNBk1OLxeWGGwUNE5JpUY13r/ppv9u5sVrcNECJL9xH74IDM4HVb1kQ4YdkW0XDtGH30xYevQ04cX5NqzsOfJFlpRuzg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769020356; c=relaxed/simple; bh=ezj+ENCHoTqQoM+GBBBvT7LTwX26bHBtoAIzwtJY3Yk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=PNd/WiGLiZ/EWOOXTB4LS3JpoW1zVEq9V7WaSvUZ69E7e3yt7+rKAOfVy6+Ku/SdqhAEvFv2ChsEdVejY6E/vTJOeJPJdI83RflOQJ7YMq06yqDJXayB0NMViBJATnNfiUuVLROpsLTZdAOIvbXeao7xdKFl7dM39H1s+gctQQs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=WzsmxaJs; 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="WzsmxaJs" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 708BCC4CEF1; Wed, 21 Jan 2026 18:32:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1769020356; bh=ezj+ENCHoTqQoM+GBBBvT7LTwX26bHBtoAIzwtJY3Yk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WzsmxaJswYzAAPDLKVX72WOUYYx8HPi1HRoQb5Top/6KSTRTcb2Jrf3ugFdFj+qup Hd9WM9iq4MZzfye+f0sfRDn9T7jvni3yHOBJoSn6ftuzK1EwdP4MAjJt0lVZRHVwiF aJ/FYIBy0Lomyczlz13imFIO4Ak9OoHzLhmIRgUc= 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.18 132/198] EDAC/i3200: Fix a resource leak in i3200_probe1() Date: Wed, 21 Jan 2026 19:16:00 +0100 Message-ID: <20260121181423.298326328@linuxfoundation.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260121181418.537774329@linuxfoundation.org> References: <20260121181418.537774329@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 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; }