Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f4f2872d authored by Dongliang Mu's avatar Dongliang Mu Committed by Sasha Levin
Browse files

ipack: tpci200: fix memory leak in the tpci200_register 



[ Upstream commit 50f05bd114a46a74726e432bf81079d3f13a55b7 ]

The error handling code in tpci200_register does not free interface_regs
allocated by ioremap and the current version of error handling code is
problematic.

Fix this by refactoring the error handling code and free interface_regs
when necessary.

Fixes: 43986798 ("ipack: add error handling for ioremap_nocache")
Cc: stable@vger.kernel.org
Reported-by: default avatarDongliang Mu <mudongliangabcd@gmail.com>
Signed-off-by: default avatarDongliang Mu <mudongliangabcd@gmail.com>
Link: https://lore.kernel.org/r/20210810100323.3938492-2-mudongliangabcd@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 19c09f4c

drivers/ipack/carriers/tpci200.c

+14 −10
Original line number Diff line number Diff line
@@ -259,7 +259,7 @@ static int tpci200_register(struct tpci200_board *tpci200) 
			"(bn 0x%X, sn 0x%X) failed to allocate PCI resource for BAR 2 !",

			tpci200->info->pdev->bus->number,

			tpci200->info->pdev->devfn);

		goto out_disable_pci;

		goto err_disable_device;

	}



	/* Request IO ID INT space (Bar 3) */
@@ -271,7 +271,7 @@ static int tpci200_register(struct tpci200_board *tpci200) 
			"(bn 0x%X, sn 0x%X) failed to allocate PCI resource for BAR 3 !",

			tpci200->info->pdev->bus->number,

			tpci200->info->pdev->devfn);

		goto out_release_ip_space;

		goto err_ip_interface_bar;

	}



	/* Request MEM8 space (Bar 5) */
@@ -282,7 +282,7 @@ static int tpci200_register(struct tpci200_board *tpci200) 
			"(bn 0x%X, sn 0x%X) failed to allocate PCI resource for BAR 5!",

			tpci200->info->pdev->bus->number,

			tpci200->info->pdev->devfn);

		goto out_release_ioid_int_space;

		goto err_io_id_int_spaces_bar;

	}



	/* Request MEM16 space (Bar 4) */
@@ -293,7 +293,7 @@ static int tpci200_register(struct tpci200_board *tpci200) 
			"(bn 0x%X, sn 0x%X) failed to allocate PCI resource for BAR 4!",

			tpci200->info->pdev->bus->number,

			tpci200->info->pdev->devfn);

		goto out_release_mem8_space;

		goto err_mem8_space_bar;

	}



	/* Map internal tpci200 driver user space */
@@ -307,7 +307,7 @@ static int tpci200_register(struct tpci200_board *tpci200) 
			tpci200->info->pdev->bus->number,

			tpci200->info->pdev->devfn);

		res = -ENOMEM;

		goto out_release_mem8_space;

		goto err_mem16_space_bar;

	}



	/* Initialize lock that protects interface_regs */
@@ -346,18 +346,22 @@ static int tpci200_register(struct tpci200_board *tpci200) 
			"(bn 0x%X, sn 0x%X) unable to register IRQ !",

			tpci200->info->pdev->bus->number,

			tpci200->info->pdev->devfn);

		goto out_release_ioid_int_space;

		goto err_interface_regs;

	}



	return 0;



out_release_mem8_space:

err_interface_regs:

	pci_iounmap(tpci200->info->pdev, tpci200->info->interface_regs);

err_mem16_space_bar:

	pci_release_region(tpci200->info->pdev, TPCI200_MEM16_SPACE_BAR);

err_mem8_space_bar:

	pci_release_region(tpci200->info->pdev, TPCI200_MEM8_SPACE_BAR);

out_release_ioid_int_space:

err_io_id_int_spaces_bar:

	pci_release_region(tpci200->info->pdev, TPCI200_IO_ID_INT_SPACES_BAR);

out_release_ip_space:

err_ip_interface_bar:

	pci_release_region(tpci200->info->pdev, TPCI200_IP_INTERFACE_BAR);

out_disable_pci:

err_disable_device:

	pci_disable_device(tpci200->info->pdev);

	return res;

}