diff options
| author | Andi Kleen <ak@suse.de> | 2006-01-11 16:43:39 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-11 22:04:51 -0500 |
| commit | 7a4a76cc1057de0dc96ee481590347aa8c5b9ffb (patch) | |
| tree | b2f2b8d46fc859b2ec4e7b6e1d3d24ffc7d1c507 /arch/i386 | |
| parent | 7180d4fb83085fef9d24b353f5bd79cf6fd98447 (diff) | |
[PATCH] x86_64: Fix off by one in acpi table mapping
And fix the test to include the size
Noticed by Vivek Goyal
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/i386')
| -rw-r--r-- | arch/i386/kernel/acpi/boot.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/kernel/acpi/boot.c b/arch/i386/kernel/acpi/boot.c index 447fa9e33ffb..2111529dea77 100644 --- a/arch/i386/kernel/acpi/boot.c +++ b/arch/i386/kernel/acpi/boot.c | |||
| @@ -108,7 +108,7 @@ char *__acpi_map_table(unsigned long phys_addr, unsigned long size) | |||
| 108 | if (!phys_addr || !size) | 108 | if (!phys_addr || !size) |
| 109 | return NULL; | 109 | return NULL; |
| 110 | 110 | ||
| 111 | if (phys_addr < (end_pfn_map << PAGE_SHIFT)) | 111 | if (phys_addr+size <= (end_pfn_map << PAGE_SHIFT) + PAGE_SIZE) |
| 112 | return __va(phys_addr); | 112 | return __va(phys_addr); |
| 113 | 113 | ||
| 114 | return NULL; | 114 | return NULL; |