Use ELF_CORE_EFLAGS for kcore ELF header flags.
Subsystems (2)
PATCH 1/1 Use ELF_CORE_EFLAGS for kcore ELF header flags.
ELF_CORE_EFLAGS is already used by the binfmt_elf coredumper to set correct arch specific ELF header flags on coredumps. Use it for kcore aswell. This corrects kcore files for the CRIS arch and I beleive it corrects ordinary coredumps for the H8/300.
---
fs/proc/kcore.c +5 -5
@@ -23,6 +23,10 @@#define CORE_STR "CORE" +#ifndef ELF_CORE_EFLAGS +#define ELF_CORE_EFLAGS 0 +#endif +static int open_kcore (struct inode * inode,struct file * filp) {return capable (CAP_SYS_RAWIO ) ?0 : -EPERM ;
@@ -164,11 +168,7 @@ static void elf_kcore_store_hdr(char *bufp, int nphdr, int dataoff) elf->e_entry =0 ; elf->e_phoff =sizeof (struct elfhdr ); elf->e_shoff =0 ; -#if defined(CONFIG_H8300 ) - elf->e_flags =ELF_FLAGS ; -#else - elf->e_flags =0 ; -#endif + elf->e_flags =ELF_CORE_EFLAGS ; elf->e_ehsize =sizeof (struct elfhdr ); elf->e_phentsize=sizeof (struct elf_phdr ); elf->e_phnum = nphdr;
include/asm-h8300/elf.h +2 -0
@@ -32,6 +32,8 @@ typedef unsigned long elf_fpregset_t;#define ELF_FLAGS 0x820000#endif +#define ELF_CORE_EFLAGS ELF_FLAGS +#define ELF_PLAT_INIT (_r) _r->er1 = 0#define USE_ELF_CORE_DUMP
Quoted 42 lines · On Tue, 12 Feb 2008 14:34:23 +0100 "Edgar E. Iglesias"…
ELF_CORE_EFLAGSis already used by thebinfmt_elfcoredumper to set correct arch specific ELF header flags on coredumps. Use it for kcore aswell. This corrects kcore files for the CRIS arch and I beleive it corrects ordinary coredumps for the H8/300.Signed-off-by Edgar E. Iglesias <[email protected]>---
fs/proc/kcore.c +5
-5@@ -23,6 +23,10 @@#define CORE_STR "CORE" +#ifndef ELF_CORE_EFLAGS +#define ELF_CORE_EFLAGS 0 +#endif +static int open_kcore (struct inode * inode,struct file * filp) {return capable (CAP_SYS_RAWIO ) ?0 : -EPERM ;@@ -164,11 +168,7 @@ static void elf_kcore_store_hdr(char *bufp, int nphdr, int dataoff) elf->e_entry =0 ; elf->e_phoff =sizeof (struct elfhdr ); elf->e_shoff =0 ; -#if defined(CONFIG_H8300 ) - elf->e_flags =ELF_FLAGS ; -#else - elf->e_flags =0 ; -#endif + elf->e_flags =ELF_CORE_EFLAGS ; elf->e_ehsize =sizeof (struct elfhdr ); elf->e_phentsize=sizeof (struct elf_phdr ); elf->e_phnum = nphdr;include/asm-h8300/elf.h +0
-0
include/asm-h8300/elf.h typedef unsigned long elf_fpregset_t; · line 39
Quoted 8 lines
include/asm-h8300/elf.h +2
-0@@ -32,6 +32,8 @@ typedef unsigned long elf_fpregset_t;#define ELF_FLAGS 0x820000#endif +#define ELF_CORE_EFLAGS ELF_FLAGS +#define ELF_PLAT_INIT (_r) _r->er1 = 0#define USE_ELF_CORE_DUMP
This will change behaviour on mips, which does
./arch/mips/kernel/binfmt_elfn32.c:#define ELF_CORE_EFLAGS EF_MIPS_ABI2
Ralf, does this fix mips, or break it?
Thanks.
At Tue, 12 Feb 2008 14:34:23 +0100,
Quoted 43 lines · Edgar E. Iglesias
ELF_CORE_EFLAGSis already used by thebinfmt_elfcoredumper to set correct arch specific ELF header flags on coredumps. Use it for kcore aswell. This corrects kcore files for the CRIS arch and I beleive it corrects ordinary coredumps for the H8/300.Signed-off-by Edgar E. Iglesias <[email protected]>---
fs/proc/kcore.c +5
-5@@ -23,6 +23,10 @@#define CORE_STR "CORE" +#ifndef ELF_CORE_EFLAGS +#define ELF_CORE_EFLAGS 0 +#endif +static int open_kcore (struct inode * inode,struct file * filp) {return capable (CAP_SYS_RAWIO ) ?0 : -EPERM ;@@ -164,11 +168,7 @@ static void elf_kcore_store_hdr(char *bufp, int nphdr, int dataoff) elf->e_entry =0 ; elf->e_phoff =sizeof (struct elfhdr ); elf->e_shoff =0 ; -#if defined(CONFIG_H8300 ) - elf->e_flags =ELF_FLAGS ; -#else - elf->e_flags =0 ; -#endif + elf->e_flags =ELF_CORE_EFLAGS ; elf->e_ehsize =sizeof (struct elfhdr ); elf->e_phentsize=sizeof (struct elf_phdr ); elf->e_phnum = nphdr;include/asm-h8300/elf.h +0
-0
include/asm-h8300/elf.h typedef unsigned long elf_fpregset_t; · line 39
Quoted 8 lines
include/asm-h8300/elf.h +2
-0@@ -32,6 +32,8 @@ typedef unsigned long elf_fpregset_t;#define ELF_FLAGS 0x820000#endif +#define ELF_CORE_EFLAGS ELF_FLAGS +#define ELF_PLAT_INIT (_r) _r->er1 = 0#define USE_ELF_CORE_DUMP
Hmm...
I think more simple.
asm-h8300/elf.h renamed from asm-h8300/elf.h~ +2 -2
@@ -26,10 +26,10 @@#define ELF_DATA ELFDATA2MSB#define ELF_ARCH EM_H8_300#if defined(__H8300H__) -#define ELF_FLAGS 0x810000 +#define ELF_CORE_FLAGS 0x810000#endif #if defined(__H8300S__) -#define ELF_FLAGS 0x820000 +#define ELF_CORE_FLAGS 0x820000#endif #define ELF_PLAT_INIT (_r) _r->er1 = 0
Signature · 2 lines
Yoshinori Sato <[email protected]>
Quoted 52 lines · Andrew Morton
Quoted 49 lines · On Tue, 12 Feb 2008 14:34:23 +0100 "Edgar E. Iglesias"…
ELF_CORE_EFLAGSis already used by thebinfmt_elfcoredumper to set correct arch specific ELF header flags on coredumps. Use it for kcore aswell. This corrects kcore files for the CRIS arch and I beleive it corrects ordinary coredumps for the H8/300.Signed-off-by Edgar E. Iglesias <[email protected]>---
fs/proc/kcore.c +5
-5@@ -23,6 +23,10 @@#define CORE_STR "CORE" +#ifndef ELF_CORE_EFLAGS +#define ELF_CORE_EFLAGS 0 +#endif +static int open_kcore (struct inode * inode,struct file * filp) {return capable (CAP_SYS_RAWIO ) ?0 : -EPERM ;@@ -164,11 +168,7 @@ static void elf_kcore_store_hdr(char *bufp, int nphdr, int dataoff) elf->e_entry =0 ; elf->e_phoff =sizeof (struct elfhdr ); elf->e_shoff =0 ; -#if defined(CONFIG_H8300 ) - elf->e_flags =ELF_FLAGS ; -#else - elf->e_flags =0 ; -#endif + elf->e_flags =ELF_CORE_EFLAGS ; elf->e_ehsize =sizeof (struct elfhdr ); elf->e_phentsize=sizeof (struct elf_phdr ); elf->e_phnum = nphdr;include/asm-h8300/elf.h +2
-0@@ -32,6 +32,8 @@ typedef unsigned long elf_fpregset_t;#define ELF_FLAGS 0x820000#endif +#define ELF_CORE_EFLAGS ELF_FLAGS +#define ELF_PLAT_INIT (_r) _r->er1 = 0
Quoted 5 lines
include/asm-h8300/elf.h typedef unsigned long elf_fpregset_t; · line 39
Quoted 1 line
include/asm-h8300/elf.h +0
-0#define USE_ELF_CORE_DUMP This will change behaviour on mips, which does
./arch/mips/kernel/binfmt_elfn32.c:#define
ELF_CORE_EFLAGSEF_MIPS_ABI2
IIUC, It will not change anything for MIPS. Please note that kcore.c was changed, not fs/binfmt_elf.c.
But I think the mips port should be defining ELF_CORE_EFLAGS in it's asm/elf.h to create kcore files that indicate the correct ABI for n32 kernels.
At the moment, I think a mips n32 kernel will dump cores for userspace programs with the correct EF_MIPS_ABI2 flag but the same kernel will create kcore files with zero eflags (o32).
Best regards
Signature · 2 lines
Edgar E. Iglesias Axis Communications AB
Quoted 14 lines · Yoshinori Sato
At Tue, 12 Feb 2008 14:34:23 +0100,
Quoted 5 lines · Edgar E. Iglesias
ELF_CORE_EFLAGSis already used by thebinfmt_elfcoredumper to set correct arch specific ELF header flags on coredumps. Use it for kcore aswell. This corrects kcore files for the CRIS arch and I beleive it corrects ordinary coredumps for the H8/300.Hmm...
I think more simple.
asm-h8300/elf.h line 33
Quoted 10 lines
asm-h8300/elf.h renamed from asm-h8300/elf.h~ +2
-2@@ -26,10 +26,10 @@#define ELF_DATA ELFDATA2MSB#define ELF_ARCH EM_H8_300#if defined(__H8300H__) -#define ELF_FLAGS 0x810000 +#define ELF_CORE_FLAGS 0x810000#endif #if defined(__H8300S__) -#define ELF_FLAGS 0x820000 +#define ELF_CORE_FLAGS 0x820000#endif
Thanks. In case you already applied this somewhere, please note that it should be ELF_CORE_EFLAGS and not ELF_CORE_FLAGS.
Here's a new patch.
Best regards
Signature · 12 lines
Edgar E. Iglesias Axis Communications AB [PATCH] Use ELF_CORE_EFLAGS for kcore dumps. ELF_CORE_EFLAGS is already used by the binfmt_elf coredumper to set correct arch specific ELF header flags on coredumps. Use it for kcore dumps aswell. At the moment, this affects the CRIS and the H8300 arch. Signed-off-by: Edgar E. Iglesias <[email protected]> ---
fs/proc/kcore.c +5 -5
@@ -23,6 +23,10 @@#define CORE_STR "CORE" +#ifndef ELF_CORE_EFLAGS +#define ELF_CORE_EFLAGS 0 +#endif +static int open_kcore (struct inode * inode,struct file * filp) {return capable (CAP_SYS_RAWIO ) ?0 : -EPERM ;
@@ -164,11 +168,7 @@ static void elf_kcore_store_hdr(char *bufp, int nphdr, int dataoff) elf->e_entry =0 ; elf->e_phoff =sizeof (struct elfhdr ); elf->e_shoff =0 ; -#if defined(CONFIG_H8300 ) - elf->e_flags =ELF_FLAGS ; -#else - elf->e_flags =0 ; -#endif + elf->e_flags =ELF_CORE_EFLAGS ; elf->e_ehsize =sizeof (struct elfhdr ); elf->e_phentsize=sizeof (struct elf_phdr ); elf->e_phnum = nphdr;
include/asm-h8300/elf.h +2 -2
@@ -26,10 +26,10 @@ typedef unsigned long elf_fpregset_t;#define ELF_DATA ELFDATA2MSB#define ELF_ARCH EM_H8_300#if defined(__H8300H__) -#define ELF_FLAGS 0x810000 +#define ELF_CORE_EFLAGS 0x810000#endif #if defined(__H8300S__) -#define ELF_FLAGS 0x820000 +#define ELF_CORE_EFLAGS 0x820000#endif #define ELF_PLAT_INIT (_r) _r->er1 = 0