From: Vishal Aslot <os.vaslot@gmail.com>
To: Bjorn Helgaas <bhelgaas@google.com>
Cc: linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org,
Vishal Aslot <os.vaslot@gmail.com>
Subject: [PATCH] PCI: ibmphp: Fix double unmap of io_mem
Date: Wed, 18 Aug 2021 11:57:51 -0500 [thread overview]
Message-ID: <20210818165751.591185-1-os.vaslot@gmail.com> (raw)
ebda_rsrc_controller() calls iounmap(io_mem) on the error path. It's
caller, ibmphp_access_ebda() also calls iounmap(io_mem) on good and
error paths. Removing the iounmap(io_mem) invocation inside
ebda_rsrc_controller().
Signed-off-by: Vishal Aslot <os.vaslot@gmail.com>
---
Why am I fixing this?
I found this clean up item in drivers/pci/hotplug/TODO [lines 43-44]
and decided to fix it. This is my 2nd patch ever in linux so my
apologies for any style issues. I am very teachable. :)
drivers/pci/hotplug/ibmphp_ebda.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/drivers/pci/hotplug/ibmphp_ebda.c b/drivers/pci/hotplug/ibmphp_ebda.c
index 11a2661dc062..7fb75401ad8a 100644
--- a/drivers/pci/hotplug/ibmphp_ebda.c
+++ b/drivers/pci/hotplug/ibmphp_ebda.c
@@ -714,8 +714,7 @@ static int __init ebda_rsrc_controller(void)
/* init hpc structure */
hpc_ptr = alloc_ebda_hpc(slot_num, bus_num);
if (!hpc_ptr) {
- rc = -ENOMEM;
- goto error_no_hpc;
+ return -ENOMEM;
}
hpc_ptr->ctlr_id = ctlr_id;
hpc_ptr->ctlr_relative_id = ctlr;
@@ -910,8 +909,6 @@ static int __init ebda_rsrc_controller(void)
kfree(tmp_slot);
error_no_slot:
free_ebda_hpc(hpc_ptr);
-error_no_hpc:
- iounmap(io_mem);
return rc;
}
--
2.27.0
next reply other threads:[~2021-08-18 16:58 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-18 16:57 Vishal Aslot [this message]
2021-09-02 17:05 ` [PATCH] PCI: ibmphp: Fix double unmap of io_mem Bjorn Helgaas
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=20210818165751.591185-1-os.vaslot@gmail.com \
--to=os.vaslot@gmail.com \
--cc=bhelgaas@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
/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