From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934206Ab3BNKMq (ORCPT ); Thu, 14 Feb 2013 05:12:46 -0500 Received: from fgwmail5.fujitsu.co.jp ([192.51.44.35]:46815 "EHLO fgwmail5.fujitsu.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759205Ab3BNKMk (ORCPT ); Thu, 14 Feb 2013 05:12:40 -0500 From: HATAYAMA Daisuke Subject: [PATCH 10/13] vmcore: round-up offset of vmcore object in page-size boundary To: ebiederm@xmission.com, vgoyal@redhat.com, cpw@sgi.com, kumagai-atsushi@mxc.nes.nec.co.jp, lisa.mitchell@hp.com Cc: kexec@lists.infradead.org, linux-kernel@vger.kernel.org Date: Thu, 14 Feb 2013 19:12:38 +0900 Message-ID: <20130214101238.22466.95192.stgit@localhost6.localdomain6> In-Reply-To: <20130214100945.22466.4172.stgit@localhost6.localdomain6> References: <20130214100945.22466.4172.stgit@localhost6.localdomain6> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org To satisfy mmap()'s page-size bounary requirement, round-up offset of each vmcore objects in page-size boundary. Signed-off-by: HATAYAMA Daisuke --- 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; }