AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

x86: add boundary check for 32bit res before expand e820 resource to alignment

Browse Source 
fix hang with HIGHMEM_64G and 32bit resource.  According to hpa and
Linus, use (resource_size_t)-1 to fend off big ranges.

Analyzed by hpa

Reported-and-tested-by: Mikael Pettersson <mikpe@it.uu.se>
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Yinghai Lu 2009-07-01 12:32:18 -07:00 committed by Linus Torvalds
parent 43644679a1
commit 7c5371c403
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
arch/x86/kernel/e820.c
View File

@ -1383,6 +1383,8 @@ static unsigned long ram_alignment(resource_size_t pos)
return 32*1024*1024; return 32*1024*1024;
} }
#define MAX_RESOURCE_SIZE ((resource_size_t)-1)
void __init e820_reserve_resources_late(void) void __init e820_reserve_resources_late(void)
{ {
int i; int i;
@ -1400,17 +1402,19 @@ void __init e820_reserve_resources_late(void)
* avoid stolen RAM: * avoid stolen RAM:
*/ */
for (i = 0; i < e820.nr_map; i++) { for (i = 0; i < e820.nr_map; i++) {
struct e820entry *entry = &e820_saved.map[i]; struct e820entry *entry = &e820.map[i];
resource_size_t start, end; u64 start, end;
if (entry->type != E820_RAM) if (entry->type != E820_RAM)
continue; continue;
start = entry->addr + entry->size; start = entry->addr + entry->size;
end = round_up(start, ram_alignment(start)); end = round_up(start, ram_alignment(start)) - 1;
if (start == end) if (end > MAX_RESOURCE_SIZE)
end = MAX_RESOURCE_SIZE;
if (start >= end)
continue; continue;
reserve_region_with_split(&iomem_resource, start, reserve_region_with_split(&iomem_resource, start, end,
end - 1, "RAM buffer"); "RAM buffer");
} }
} }