lkml.org 
[lkml]   [2013]   [Oct]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Subject[PATCH 17/19] Identify the ELF class of the process
From
Date
From:Suzuki K. Poulose <suzuki@in.ibm.com>

Identify the ELF class of the process to native or compat.

Signed-off-by: Suzuki K. Poulose <suzuki@in.ibm.com>
---
fs/proc/gencore.c | 17 ++++++++++++++---
fs/proc/gencore.h | 3 +++
2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/fs/proc/gencore.c b/fs/proc/gencore.c
index 463bedd..3e0db30 100644
--- a/fs/proc/gencore.c
+++ b/fs/proc/gencore.c
@@ -64,6 +64,9 @@ static ssize_t read_gencore(struct file *file, char __user *buffer,
}
mutex_unlock(&core_mutex);

+ if (cp->elf_class == ELF_CLASS_NATIVE)
+ ret = elf_read_gencore(cp, buffer, buflen, fpos);
+
out:
put_task_struct(task);
return ret;
@@ -147,8 +150,8 @@ static int release_gencore(struct inode *inode, struct file *file)
/*
* Determine whether the task is an ELF executable.
* Returns
- * < 0 - Non-ELF
- * 0 - Native ELF Executable
+ * -EINVAL - On non ELF execs
+ * Returns the ELF_CLASS_NATIVE or ELF_CLASS_COMPAT
*/
static int get_elf_class(struct task_struct *task)
{
@@ -162,7 +165,14 @@ static int get_elf_class(struct task_struct *task)
if (memcmp(hdr.e_ident, ELFMAG, SELFMAG))
return -EINVAL;
if (elf_check_arch(&hdr))
- return 0;
+ return ELF_CLASS_NATIVE;
+#ifdef CONFIG_COMPAT_BINFMT_ELF
+ {
+ struct elf32_hdr *chdr = (struct elf32_hdr *)&hdr;
+ if (compat_elf_check_arch(chdr))
+ return ELF_CLASS_COMPAT;
+ }
+#endif

return -EINVAL;
}
@@ -206,6 +216,7 @@ static int open_gencore(struct inode *inode, struct file *filp)
list_add(&cp->list, &core_list);
mutex_unlock(&core_mutex);
max_regset = get_max_regsets(task);
+ cp->elf_class = elf_class;

for (i = 0; i < get_nr_threads(task); i++) {
tinfo = kzalloc(offsetof(struct elf_thread_core_info,
diff --git a/fs/proc/gencore.h b/fs/proc/gencore.h
index f6822f2..d7a5fb3 100644
--- a/fs/proc/gencore.h
+++ b/fs/proc/gencore.h
@@ -8,6 +8,8 @@
#include <linux/elfcore.h>
#include <linux/elfcore-internal.h>

+enum { ELF_CLASS_NATIVE, ELF_CLASS_COMPAT };
+
struct elf_thread_core_info {
unsigned short num_notes; /* Number of notes for this thread */
struct elf_thread_core_info *next;
@@ -31,6 +33,7 @@ struct core_proc {
size_t nphdrs; /* number of phdrs */
size_t notes_size;
size_t size;
+ unsigned char elf_class;
};

#ifdef CORE_DUMP_USE_REGSET


\
 
 \ /
  Last update: 2013-10-04 13:41    [W:0.204 / U:0.444 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site