commit 02bd9eca0b439b6950ab72ba64b67181e5bf0fbd
author Petr Machata <pmachata@redhat.com> Wed Sep 21 17:38:59 2011 +0200
committer Petr Machata <pmachata@redhat.com> Thu Oct 06 14:30:36 2011 +0200
tree 8ba70f2c9c3504be745f1b5c25e1ee3c40d5bc40
parent 993f412c60e168e67e9b64fe5a300a2868c8d71d

Check whether ABI is supported before we execute the binary

- this is fallout of the reorganization of open_program/execute_program.
  I still think it makes better sense this wey, even though we need to
  do the additional checking step now.

libltrace.c

diff --git a/libltrace.c b/libltrace.c
index e731fe1..19bfafd 100644
--- a/libltrace.c
+++ b/libltrace.c
@@ -107,6 +107,11 @@
 		}
 	}
 	if (command) {
+		/* Check that the binary ABI is supported before
+		 * calling execute_program.  */
+		struct ltelf lte = {};
+		open_elf(&lte, command);
+
 		open_program(command, execute_program(command, argv), 0);
 	}
 	opt_p_tmp = opt_p;

ltrace-elf.c

diff --git a/ltrace-elf.c b/ltrace-elf.c
index cc27e17..f24c2a1 100644
--- a/ltrace-elf.c
+++ b/ltrace-elf.c
@@ -136,18 +136,14 @@
 }
 
 int
-do_init_elf(struct ltelf *lte, const char *filename) {
-	int i;
-	GElf_Addr relplt_addr = 0;
-	size_t relplt_size = 0;
-
-	debug(DEBUG_FUNCTION, "do_init_elf(filename=%s)", filename);
-	debug(1, "Reading ELF from %s...", filename);
-
+open_elf(struct ltelf *lte, const char *filename)
+{
 	lte->fd = open(filename, O_RDONLY);
 	if (lte->fd == -1)
 		return 1;
 
+	elf_version(EV_CURRENT);
+
 #ifdef HAVE_ELF_C_READ_MMAP
 	lte->elf = elf_begin(lte->fd, ELF_C_READ_MMAP, NULL);
 #else
@@ -180,6 +176,21 @@
 		error(EXIT_FAILURE, 0,
 		      "\"%s\" is ELF from incompatible architecture", filename);
 
+	return 0;
+}
+
+int
+do_init_elf(struct ltelf *lte, const char *filename) {
+	int i;
+	GElf_Addr relplt_addr = 0;
+	size_t relplt_size = 0;
+
+	debug(DEBUG_FUNCTION, "do_init_elf(filename=%s)", filename);
+	debug(1, "Reading ELF from %s...", filename);
+
+	if (open_elf(lte, filename) < 0)
+		return -1;
+
 	Elf_Data *plt_data = NULL;
 	GElf_Addr ppcgot = 0;
 
@@ -621,8 +632,6 @@
 	library_num = 0;
 	proc->libdl_hooked = 0;
 
-	elf_version(EV_CURRENT);
-
 	if (do_init_elf(lte, proc->filename))
 		return NULL;
 

ltrace-elf.h

diff --git a/ltrace-elf.h b/ltrace-elf.h
index a29fe2c..3b675c5 100644
--- a/ltrace-elf.h
+++ b/ltrace-elf.h
@@ -44,6 +44,7 @@
 extern size_t library_num;
 extern char *library[MAX_LIBRARIES];
 
+extern int open_elf(struct ltelf *lte, const char *filename);
 extern struct library_symbol *read_elf(Process *);
 
 extern GElf_Addr arch_plt_sym_val(struct ltelf *, size_t, GElf_Rela *);