projects
/
GitHub
/
MotorolaMobilityLLC
/
kernel-slsi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b701533
)
[PATCH] Fix a memory leak in the i386 setup code
author
Catalin Marinas
<catalin.marinas@gmail.com>
Fri, 14 Jul 2006 07:23:59 +0000
(
00:23
-0700)
committer
Linus Torvalds
<torvalds@g5.osdl.org>
Sat, 15 Jul 2006 04:53:51 +0000
(21:53 -0700)
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
arch/i386/kernel/setup.c
patch
|
blob
|
blame
|
history
diff --git
a/arch/i386/kernel/setup.c
b/arch/i386/kernel/setup.c
index 7864395c1441f0b2aef4b5672c52a7732ae5f0ad..f1682206d304d31fb650992bf8a1cb551b2c54ee 100644
(file)
--- a/
arch/i386/kernel/setup.c
+++ b/
arch/i386/kernel/setup.c
@@
-1327,7
+1327,10
@@
legacy_init_iomem_resources(struct resource *code_resource, struct resource *dat
res->start = e820.map[i].addr;
res->end = res->start + e820.map[i].size - 1;
res->flags = IORESOURCE_MEM | IORESOURCE_BUSY;
- request_resource(&iomem_resource, res);
+ if (request_resource(&iomem_resource, res)) {
+ kfree(res);
+ continue;
+ }
if (e820.map[i].type == E820_RAM) {
/*
* We don't know which RAM region contains kernel data,