From: Dongliang Mu <mudongliangabcd@gmail.com>
To: Samuel Iglesias Gonsalvez <siglesias@igalia.com>,
Jens Taprogge <jens.taprogge@taprogge.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Dongliang Mu <mudongliangabcd@gmail.com>,
Aditya Srivastava <yashsri421@gmail.com>,
Randy Dunlap <rdunlap@infradead.org>,
Lv Yunlong <lyl2019@mail.ustc.edu.cn>,
Zhouyang Jia <jiazhouyang09@gmail.com>
Cc: industrypack-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org
Subject: [PATCH v2 2/4] ipack: tpci200: fix memory leak in the tpci200_register
Date: Mon, 9 Aug 2021 22:30:27 +0800 [thread overview]
Message-ID: <20210809143049.3531188-2-mudongliangabcd@gmail.com> (raw)
In-Reply-To: <20210809143049.3531188-1-mudongliangabcd@gmail.com>
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.
Reported-by: Dongliang Mu <mudongliangabcd@gmail.com>
Fixes: 43986798fd50 ("ipack: add error handling for ioremap_nocache")
Signed-off-by: Dongliang Mu <mudongliangabcd@gmail.com>
---
drivers/ipack/carriers/tpci200.c | 24 ++++++++++++++----------
1 file changed, 14 insertions(+), 10 deletions(-)
diff --git a/drivers/ipack/carriers/tpci200.c b/drivers/ipack/carriers/tpci200.c
index 3f198b2405e3..b1562b881cd1 100644
--- a/drivers/ipack/carriers/tpci200.c
+++ b/drivers/ipack/carriers/tpci200.c
@@ -254,7 +254,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) */
@@ -266,7 +266,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) */
@@ -277,7 +277,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) */
@@ -288,7 +288,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 */
@@ -302,7 +302,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 */
@@ -341,18 +341,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->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;
}
--
2.25.1
next prev parent reply other threads:[~2021-08-09 14:31 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-09 14:30 [PATCH v2 1/4] ipack: tpci200: fix many double free issues in tpci200_pci_probe Dongliang Mu
2021-08-09 14:30 ` Dongliang Mu [this message]
2021-08-09 15:32 ` [PATCH v2 2/4] ipack: tpci200: fix memory leak in the tpci200_register Greg Kroah-Hartman
2021-08-09 23:09 ` Dongliang Mu
2021-08-10 6:09 ` Greg Kroah-Hartman
2021-08-09 14:30 ` [PATCH v2 3/4] ipack: tpci200: change pci_iounmap to iounmap Dongliang Mu
2021-08-09 15:33 ` Greg Kroah-Hartman
2021-08-09 18:22 ` kernel test robot
2021-08-09 18:29 ` Andy Shevchenko
2021-08-09 21:23 ` kernel test robot
2021-08-09 14:30 ` [PATCH v2 4/4] ipack: tpci200: move tpci200_unregister close to tpci200_register Dongliang Mu
2021-08-09 15:33 ` Greg Kroah-Hartman
2021-08-09 23:54 ` Dongliang Mu
2021-08-09 15:32 ` [PATCH v2 1/4] ipack: tpci200: fix many double free issues in tpci200_pci_probe Greg Kroah-Hartman
2021-08-09 23:08 ` Dongliang Mu
2021-08-09 23:41 ` Dongliang Mu
2021-08-10 6:12 ` Greg Kroah-Hartman
2021-08-10 6:27 ` Dongliang Mu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210809143049.3531188-2-mudongliangabcd@gmail.com \
--to=mudongliangabcd@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=industrypack-devel@lists.sourceforge.net \
--cc=jens.taprogge@taprogge.org \
--cc=jiazhouyang09@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=lyl2019@mail.ustc.edu.cn \
--cc=rdunlap@infradead.org \
--cc=siglesias@igalia.com \
--cc=yashsri421@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®