Commit 93fc4e04 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'edac_urgent_for_v6.19_rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras 

Pull EDAC fixes from Borislav Petkov:
 "Make sure the memory-mapped memory controller registers BAR gets
  unmapped when the driver memory allocation fails

  Fix that in both x38 and i3200 EDAC drivers as former has copied the
  bug from the latter, it looks like"

* tag 'edac_urgent_for_v6.19_rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras:
  EDAC/x38: Fix a resource leak in x38_probe1()
  EDAC/i3200: Fix a resource leak in i3200_probe1()
parents e503f539 0ff7c441

drivers/edac/i3200_edac.c

+6 −5
Original line number Diff line number Diff line
@@ -358,10 +358,11 @@ static int i3200_probe1(struct pci_dev *pdev, int dev_idx) 
	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 *pdev, int dev_idx) 
	return 0;



fail:

	iounmap(window);

	if (mci)

	edac_mc_free(mci);

unmap:

	iounmap(window);



	return rc;

}

drivers/edac/x38_edac.c

+6 −3
Original line number Diff line number Diff line
@@ -341,9 +341,12 @@ static int x38_probe1(struct pci_dev *pdev, int dev_idx) 
	layers[1].type = EDAC_MC_LAYER_CHANNEL;

	layers[1].size = x38_channel_num;

	layers[1].is_virt_csrow = false;





	rc = -ENOMEM;

	mci = edac_mc_alloc(0, ARRAY_SIZE(layers), layers, 0);

	if (!mci)

		return -ENOMEM;

		goto unmap;



	edac_dbg(3, "MC: init mci\n");
@@ -403,9 +406,9 @@ static int x38_probe1(struct pci_dev *pdev, int dev_idx) 
	return 0;



fail:

	iounmap(window);

	if (mci)

	edac_mc_free(mci);

unmap:

	iounmap(window);



	return rc;

}