Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755238Ab3CEHGb (ORCPT ); Tue, 5 Mar 2013 02:06:31 -0500 Received: from fgwmail6.fujitsu.co.jp ([192.51.44.36]:50276 "EHLO fgwmail6.fujitsu.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755134Ab3CEHG1 (ORCPT ); Tue, 5 Mar 2013 02:06:27 -0500 From: HATAYAMA Daisuke Subject: [PATCH v2 16/20] vmcore: check NT_VMCORE_PAD as a mark indicating the end of ELF note buffer To: vgoyal@redhat.com, ebiederm@xmission.com, cpw@sgi.com, kumagai-atsushi@mxc.nes.nec.co.jp, lisa.mitchell@hp.com, heiko.carstens@de.ibm.com, akpm@linux-foundation.org Cc: kexec@lists.infradead.org, linux-kernel@vger.kernel.org Date: Sat, 02 Mar 2013 17:37:20 +0900 Message-ID: <20130302083720.31252.92900.stgit@localhost6.localdomain6> In-Reply-To: <20130302083447.31252.93914.stgit@localhost6.localdomain6> References: <20130302083447.31252.93914.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 Content-Length: 2336 Lines: 71 Modern kernel marks the end of ELF note buffer with NT_VMCORE_PAD type note in order to make the buffer satisfy mmap()'s page-size boundary requirement. This patch makes finishing reading each buffer if the note type now being read is NT_VMCORE_PAD type. Signed-off-by: HATAYAMA Daisuke --- fs/proc/vmcore.c | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/fs/proc/vmcore.c b/fs/proc/vmcore.c index c8899dc..e432946 100644 --- a/fs/proc/vmcore.c +++ b/fs/proc/vmcore.c @@ -259,12 +259,24 @@ static int __init merge_note_headers_elf64(char *elfptr, size_t *elfsz, } nhdr_ptr = notes_section; for (j = 0; j < max_sz; j += sz) { + char *name; + + /* Old kernel marks the end of ELF note buffer + * with empty header. */ if (nhdr_ptr->n_namesz == 0) break; sz = sizeof(Elf64_Nhdr) + ((nhdr_ptr->n_namesz + 3) & ~3) + ((nhdr_ptr->n_descsz + 3) & ~3); real_sz += sz; + + /* Modern kernel marks the end of ELF note + * buffer with NT_VMCORE_PAD type note. */ + name = (char *)(nhdr_ptr + 1); + if (strncmp(name, VMCOREINFO_NOTE_NAME, + sizeof(VMCOREINFO_NOTE_NAME)) == 0 + && nhdr_ptr->n_type == NT_VMCORE_PAD) + break; nhdr_ptr = (Elf64_Nhdr*)((char*)nhdr_ptr + sz); } @@ -369,12 +381,24 @@ static int __init merge_note_headers_elf32(char *elfptr, size_t *elfsz, } nhdr_ptr = notes_section; for (j = 0; j < max_sz; j += sz) { + char *name; + + /* Old kernel marks the end of ELF note buffer + * with empty header. */ if (nhdr_ptr->n_namesz == 0) break; sz = sizeof(Elf32_Nhdr) + ((nhdr_ptr->n_namesz + 3) & ~3) + ((nhdr_ptr->n_descsz + 3) & ~3); real_sz += sz; + + /* Modern kernel marks the end of ELF note + * buffer with NT_VMCORE_PAD type note. */ + name = (char *)(nhdr_ptr + 1); + if (strncmp(name, VMCOREINFO_NOTE_NAME, + sizeof(VMCOREINFO_NOTE_NAME)) == 0 + && nhdr_ptr->n_type == NT_VMCORE_PAD) + break; nhdr_ptr = (Elf32_Nhdr*)((char*)nhdr_ptr + sz); } -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/