Signed-off-by: Andrew Morton --- 25-akpm/kernel/crash_dump.c | 5 ++++- arch/i386/mm/highmem.c | 0 include/asm-i386/highmem.h | 0 include/linux/highmem.h | 0 4 files changed, 4 insertions(+), 1 deletion(-) diff -puN arch/i386/mm/highmem.c~crashdump-routines-for-copying-dump-pages-fixes arch/i386/mm/highmem.c diff -puN include/asm-i386/highmem.h~crashdump-routines-for-copying-dump-pages-fixes include/asm-i386/highmem.h diff -puN include/linux/highmem.h~crashdump-routines-for-copying-dump-pages-fixes include/linux/highmem.h diff -puN kernel/crash_dump.c~crashdump-routines-for-copying-dump-pages-fixes kernel/crash_dump.c --- 25/kernel/crash_dump.c~crashdump-routines-for-copying-dump-pages-fixes Fri Feb 4 15:21:25 2005 +++ 25-akpm/kernel/crash_dump.c Fri Feb 4 15:22:39 2005 @@ -28,6 +28,8 @@ ssize_t copy_oldmem_page(unsigned long p return 0; page = kmalloc(PAGE_SIZE, GFP_KERNEL); + if (!page) + return -ENOMEM; vaddr = kmap_atomic_pfn(pfn, KM_PTE0); copy_page(page, vaddr); @@ -38,8 +40,9 @@ ssize_t copy_oldmem_page(unsigned long p kfree(page); return -EFAULT; } - } else + } else { memcpy(buf, page, csize); + } kfree(page); return 0; _