[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20130214101238.22466.95192.stgit@localhost6.localdomain6>
Date: Thu, 14 Feb 2013 19:12:38 +0900
From: HATAYAMA Daisuke <d.hatayama@...fujitsu.com>
To: ebiederm@...ssion.com, vgoyal@...hat.com, cpw@....com,
kumagai-atsushi@....nes.nec.co.jp, lisa.mitchell@...com
Cc: kexec@...ts.infradead.org, linux-kernel@...r.kernel.org
Subject: [PATCH 10/13] vmcore: round-up offset of vmcore object in page-size
boundary
To satisfy mmap()'s page-size bounary requirement, round-up offset of
each vmcore objects in page-size boundary.
Signed-off-by: HATAYAMA Daisuke <d.hatayama@...fujitsu.com>
---
fs/proc/vmcore.c | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/fs/proc/vmcore.c b/fs/proc/vmcore.c
index ccf0dc5..afedb5f 100644
--- a/fs/proc/vmcore.c
+++ b/fs/proc/vmcore.c
@@ -517,7 +517,7 @@ static int __init process_ptload_program_headers_elf32(char *elfptr,
}
/* Sets offset fields of vmcore elements. */
-static void __init set_vmcore_list_offsets_elf64(char *elfptr,
+static void __init set_vmcore_list_offsets_elf64(char *elfptr, size_t elfsz,
struct list_head *vc_list)
{
loff_t vmcore_off;
@@ -527,12 +527,11 @@ static void __init set_vmcore_list_offsets_elf64(char *elfptr,
ehdr_ptr = (Elf64_Ehdr *)elfptr;
/* Skip Elf header and program headers. */
- vmcore_off = sizeof(Elf64_Ehdr) +
- (ehdr_ptr->e_phnum) * sizeof(Elf64_Phdr);
+ vmcore_off = elfsz;
list_for_each_entry(m, vc_list, list) {
m->offset = vmcore_off;
- vmcore_off += m->size;
+ vmcore_off += roundup(m->size, PAGE_SIZE);
}
}
@@ -613,7 +612,7 @@ static int __init parse_crash_elf64_headers(void)
get_order(elfcorebuf_sz_orig));
return rc;
}
- set_vmcore_list_offsets_elf64(elfcorebuf, &vmcore_list);
+ set_vmcore_list_offsets_elf64(elfcorebuf, elfcorebuf_sz, &vmcore_list);
return 0;
}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists