| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20140320094048.14878.1986.stgit@localhost.localdomain>
Date: Thu, 20 Mar 2014 15:10:48 +0530
From: Janani Venkataraman <jananive@...ux.vnet.ibm.com>
To: linux-kernel@...r.kernel.org
Cc: amwang@...hat.com, procps@...elists.org, rdunlap@...otime.net,
james.hogan@...tec.com, aravinda@...ux.vnet.ibm.com, hch@....de,
mhiramat@...hat.com, jeremy.fitzhardinge@...rix.com,
xemul@...allels.com, d.hatayama@...fujitsu.com, coreutils@....org,
kosaki.motohiro@...fujitsu.com, adobriyan@...il.com,
util-linux@...r.kernel.org, tarundsk@...ux.vnet.ibm.com,
vapier@...too.org, roland@...k.frob.com, ananth@...ux.vnet.ibm.com,
gorcunov@...nvz.org, avagin@...nvz.org, oleg@...hat.com,
eparis@...hat.com, suzuki@...ux.vnet.ibm.com, andi@...stfloor.org,
tj@...nel.org, akpm@...ux-foundation.org,
torvalds@...ux-foundation.org
Subject: [PATCH 12/33] Fetch File maps
The file maps details are got from the maps linked list which was
populated in Patch 5 and they are filled as a note in the following
format.
long count -- how many files are mapped
long page_size -- units for file_ofs
array of [COUNT] elements of
long start
long end
long file_ofs
followed by COUNT filenames in ASCII: "FILE1" NUL "FILE2" NUL...
Signed-off-by: Suzuki K. Poulose <suzuki@...ibm.com>
Signed-off-by: Janani Venkataraman <jananive@...ux.vnet.ibm.com>
---
src/elf.c | 78 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
src/elf32.c | 1 +
src/elf64.c | 1 +
3 files changed, 80 insertions(+)
diff --git a/src/elf.c b/src/elf.c
index b7fd6d0..9e3623f 100644
--- a/src/elf.c
+++ b/src/elf.c
@@ -308,6 +308,79 @@ static int get_auxv(int pid, struct core_proc *cp)
return ret;
}
+/*
+ * Get File Maps in the following format:
+ * long count -- how many files are mapped
+ * long page_size -- units for file_ofs
+ * array of [COUNT] elements of
+ * long start
+ * long end
+ * long file_ofs
+ * followed by COUNT filenames in ASCII: "FILE1" NUL "FILE2" NUL...
+ */
+static int get_file_maps(struct core_proc *cp)
+{
+ Elf_Long count = 0;
+ Elf_Long fmap_size = 0, namesz = 0;
+ Elf_Long *fmap;
+ Elf_Long *data_pos;
+ unsigned char *name_pos;
+ int ret;
+ struct maps *map = cp->vmas;
+
+ /*
+ * Finding the actual size of the file map for which we need
+ * to know number of VMAS(non zero inode) plus the file name size
+ * for each of the VMAS(non zero inode.
+ */
+ while (map) {
+ if (map->inode) {
+ count++;
+ namesz += strlen(map->fname) + 1;
+ }
+ map = map->next;
+ }
+
+ /*
+ * We add 2 for the count and page_size, 3 * (number of vmas)
+ * for the start, end and file_ofs and finally the entire size
+ * of the filenames of all the VMAS.
+ */
+ fmap_size = ((2 + (3 * count)) * sizeof(Elf_Long))
+ + (namesz * sizeof(unsigned char));
+
+ fmap = calloc(fmap_size, 1);
+ if (!fmap) {
+ status = errno;
+ gencore_log("Could not allocate memory for file map data\n");
+ return -1;
+ }
+
+ data_pos = fmap + 2;
+ name_pos = (unsigned char *)(fmap + 2 + (count * 3));
+
+ map = cp->vmas;
+ while (map) {
+ if (map->inode) {
+ *data_pos++ = map->src;
+ *data_pos++ = map->dst;
+ *data_pos++ = map->offset;
+
+ strcpy(name_pos, map->fname);
+ name_pos += strlen(map->fname) + 1;
+ }
+ map = map->next;
+ }
+
+ fmap[0] = count;
+ fmap[1] = 1;
+
+ ret = add_note("CORE", NT_FILE, fmap_size, fmap, cp);
+ free(fmap);
+
+ return ret;
+}
+
int do_elf_coredump(int pid, struct core_proc *cp)
{
int ret;
@@ -327,5 +400,10 @@ int do_elf_coredump(int pid, struct core_proc *cp)
if (ret)
return -1;
+ /* Get File maps */
+ ret = get_file_maps(cp);
+ if (ret)
+ return -1;
+
return 0;
}
diff --git a/src/elf32.c b/src/elf32.c
index 8778bed..0f7c03d 100644
--- a/src/elf32.c
+++ b/src/elf32.c
@@ -35,5 +35,6 @@
#define Elf_Shdr Elf32_Shdr
#define Elf_Nhdr Elf32_Nhdr
#define Elf_prpsinfo compat_elf_prpsinfo
+#define Elf_Long int
#include "elf.c"
diff --git a/src/elf64.c b/src/elf64.c
index d062888..77da222 100644
--- a/src/elf64.c
+++ b/src/elf64.c
@@ -35,5 +35,6 @@
#define Elf_Shdr Elf64_Shdr
#define Elf_Nhdr Elf64_Nhdr
#define Elf_prpsinfo elf_prpsinfo
+#define Elf_Long long
#include "elf.c"
--
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