edac: fix a resource leak in i3200_probe1()

[PATCH] edac: fix a resource leak in i3200_probe1()

Posted by Haoxiang Li 1 month, 2 weeks ago

If edac_mc_alloc() fails, also unmap the window.
Add a goto to do so.

Found by code review and compiled on ubuntu 20.04

Fixes: dd8ef1db87a4 ("edac: i3200 memory controller driver")
Cc: stable@vger.kernel.org
Signed-off-by: Haoxiang Li <lihaoxiang@isrc.iscas.ac.cn>
---
 drivers/edac/i3200_edac.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/edac/i3200_edac.c b/drivers/edac/i3200_edac.c
index afccdebf5ac1..fd5dc33c406f 100644
--- a/drivers/edac/i3200_edac.c
+++ b/drivers/edac/i3200_edac.c
@@ -360,8 +360,10 @@ static int i3200_probe1(struct pci_dev *pdev, int dev_idx)
 	layers[1].is_virt_csrow = false;
 	mci = edac_mc_alloc(0, ARRAY_SIZE(layers), layers,
 			    sizeof(struct i3200_priv));
-	if (!mci)
-		return -ENOMEM;
+	if (!mci) {
+		rc = -ENOMEM;
+		goto fail;
+	}
 
 	edac_dbg(3, "MC: init mci\n");
 
-- 
2.25.1

Re: [PATCH] edac: fix a resource leak in i3200_probe1()

Posted by Borislav Petkov 1 month ago

On Tue, Dec 23, 2025 at 08:32:02PM +0800, Haoxiang Li wrote:
> If edac_mc_alloc() fails, also unmap the window.
> Add a goto to do so.
> 
> Found by code review and compiled on ubuntu 20.04
> 
> Fixes: dd8ef1db87a4 ("edac: i3200 memory controller driver")
> Cc: stable@vger.kernel.org
> Signed-off-by: Haoxiang Li <lihaoxiang@isrc.iscas.ac.cn>
> ---
>  drivers/edac/i3200_edac.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)

Both applied, thanks.

-- 
Regards/Gruss,
    Boris.

https://people.kernel.org/tglx/notes-about-netiquette