From: Bernd Schubert <bernd.schubert@itwm.fraunhofer.de>
To: x86@kernel.org
Cc: catalin.marinas@arm.com, linux-kernel@vger.kernel.org
Subject: [PATCH] Fix a memory leak reported by kmemleak.
Date: Tue, 21 Jun 2011 13:08:53 +0200 [thread overview]
Message-ID: <20110621110853.2537133.20464.stgit@localhost.localdomain> (raw)
Memory allocated by get_current_resources() will be never free'ed
if 'pci_use_crs' is not set.
Signed-off-by: Bernd Schubert <bernd.schubert@itwm.fraunhofer.de>
---
arch/x86/pci/acpi.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/arch/x86/pci/acpi.c b/arch/x86/pci/acpi.c
index 0972315..3ad040a 100644
--- a/arch/x86/pci/acpi.c
+++ b/arch/x86/pci/acpi.c
@@ -228,8 +228,11 @@ static void add_resources(struct pci_root_info *info)
int i;
struct resource *res, *root, *conflict;
- if (!pci_use_crs)
+ if (!pci_use_crs) {
+ kfree(info->res);
+ kfree(info->name);
return;
+ }
coalesce_windows(info, IORESOURCE_MEM);
coalesce_windows(info, IORESOURCE_IO);
next reply other threads:[~2011-06-21 11:08 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-21 11:08 Bernd Schubert [this message]
2011-06-21 12:46 ` Catalin Marinas
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=20110621110853.2537133.20464.stgit@localhost.localdomain \
--to=bernd.schubert@itwm.fraunhofer.de \
--cc=catalin.marinas@arm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=x86@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
all inboxes | Powered by JetHome®