diff --git a/include/byteorder.h b/include/byteorder.h
index d4a2c8c..d5ebd61 100644
--- a/include/byteorder.h
+++ b/include/byteorder.h
@@ -53,6 +53,20 @@ static inline void bswap_64p (uint64_t *x)
 	*x = __builtin_bswap64(*x);
 }
 
+static inline uint16_t cond_bswap_16 (uint16_t x, int swap)
+{
+	return swap ? bswap_16(x) : x;
+}
+
+static inline uint32_t cond_bswap_32 (uint32_t x, int swap)
+{
+	return swap ? bswap_32(x) : x;
+}
+
+static inline uint64_t cond_bswap_64 (uint64_t x, int swap)
+{
+	return swap ? bswap_64(x) : x;
+}
 
 /* gcc defines __BIG_ENDIAN__ on big endian targets */
 #ifdef __BIG_ENDIAN__
diff --git a/include/helpers.h b/include/helpers.h
index 47b2674..43122c9 100644
--- a/include/helpers.h
+++ b/include/helpers.h
@@ -51,5 +51,7 @@ extern unsigned long SLOF_get_vtpm_unit(void);
 			const typeof(((type *)0)->member)* struct_ptr = (ptr); \
 			(type *)((char *)struct_ptr - offset_of(type, member)); })
 #define ARRAY_SIZE(x) (sizeof(x) / sizeof(x[0]))
+#define ROUNDUP(x,v) ((((x) + (v - 1)) / v) * v)
+#define MAX(x,y) ((x) > (y) ? (x) : (y))
 
 #endif
diff --git a/include/libelf.h b/include/libelf.h
index 5fbf279..76bfc27 100644
--- a/include/libelf.h
+++ b/include/libelf.h
@@ -96,4 +96,8 @@ void elf_relocate64(void *file_addr, signed long offset);
 
 int elf_forth_claim(void *addr, long size);
 
+int elf_get_file_size(const void *buffer, const long buffer_size);
+int elf_get_file_size32(const void *buffer, const long buffer_size);
+int elf_get_file_size64(const void *buffer, const long buffer_size);
+
 #endif				/* __LIBELF_H */
diff --git a/lib/libelf/elf.c b/lib/libelf/elf.c
index 5204bc3..91dd3f7 100644
--- a/lib/libelf/elf.c
+++ b/lib/libelf/elf.c
@@ -196,3 +196,31 @@ elf_get_base_addr(void *file_addr)
 
 	return -1;
 }
+
+/**
+ * Get the file size of the ELF image that has been loaded into a
+ * buffer larger than the size of the file
+ * @return  The size of the ELF image or < 0 for error
+ */
+int elf_get_file_size(const void *buffer, const long buffer_size)
+{
+	const struct ehdr *ehdr = (const struct ehdr *)buffer;
+
+	if (buffer_size < sizeof(struct ehdr))
+		return -1;
+
+	/* check if it is an ELF image at all */
+	if (cpu_to_be32(ehdr->ei_ident) != 0x7f454c46)
+		return -1;
+
+	switch (ehdr->ei_class) {
+	case 1:
+		/* Determine file size of a 32-bit file */
+		return elf_get_file_size32(buffer, buffer_size);
+	case 2:
+		/* Determine file size of a 64-bit file */
+		return elf_get_file_size64(buffer, buffer_size);
+	}
+
+	return -1;
+}
diff --git a/lib/libelf/elf32.c b/lib/libelf/elf32.c
index fea5cf4..5cef072 100644
--- a/lib/libelf/elf32.c
+++ b/lib/libelf/elf32.c
@@ -17,6 +17,7 @@
 #include <string.h>
 #include <libelf.h>
 #include <byteorder.h>
+#include <helpers.h>
 
 struct ehdr32 {
 	uint32_t ei_ident;
@@ -50,6 +51,18 @@ struct phdr32 {
 	uint32_t p_align;
 };
 
+struct shdr32 {
+	uint32_t sh_name;
+	uint32_t sh_type;
+	uint32_t sh_flags;
+	uint32_t sh_addr;
+	uint32_t sh_offset;
+	uint32_t sh_size;
+	uint32_t sh_link;
+	uint32_t sh_info;
+	uint32_t sh_addralign;
+	uint32_t sh_entsize;
+};
 
 static struct phdr32*
 get_phdr32(void *file_addr)
@@ -191,3 +204,65 @@ elf_byteswap_header32(void *file_addr)
 		phdr = (struct phdr32 *)(((uint8_t *)phdr) + ehdr->e_phentsize);
 	}
 }
+
+/*
+ * Determine the size of an ELF image that has been loaded into
+ * a buffer larger than its size. We search all program headers
+ * and sections for the one that shows the farthest extent of the
+ * file.
+ * @return Return -1 on error, size of file otherwise.
+ */
+int elf_get_file_size32(const void *buffer, const long buffer_size)
+{
+	const struct ehdr32 *ehdr = (const struct ehdr32 *) buffer;
+	const void *buffer_end = buffer + buffer_size;
+	const struct phdr32 *phdr;
+	const struct shdr32 *shdr;
+	long elf_size = -1;
+	uint16_t entsize;
+	int do_swap;
+	unsigned i;
+
+	if (buffer_size < sizeof(struct ehdr) || ehdr->e_ehsize != 52)
+		return -1;
+
+#ifdef __BIG_ENDIAN__
+	do_swap = ehdr->ei_data != ELFDATA2MSB;
+#else
+	do_swap = ehdr->ei_data != ELFDATA2LSB;
+#endif
+
+	phdr = buffer + cond_bswap_32(ehdr->e_phoff, do_swap);
+	entsize = cond_bswap_16(ehdr->e_phentsize, do_swap);
+	for (i = 0; i < cond_bswap_16(ehdr->e_phnum, do_swap); i++) {
+		if ((void *)phdr + entsize > buffer_end)
+			return -1;
+
+		elf_size = MAX(cond_bswap_32(phdr->p_offset, do_swap) +
+			         cond_bswap_32(phdr->p_filesz, do_swap),
+			       elf_size);
+
+		/* step to next header */
+		phdr = (struct phdr32 *)(((uint8_t *)phdr) + entsize);
+	}
+
+	shdr = buffer + cond_bswap_32(ehdr->e_shoff, do_swap);
+	entsize = cond_bswap_16(ehdr->e_shentsize, do_swap);
+	for (i = 0; i < cond_bswap_16(ehdr->e_shnum, do_swap); i++) {
+		if ((void *)shdr + entsize > buffer_end)
+			return -1;
+
+		elf_size = MAX(cond_bswap_32(shdr->sh_offset, do_swap) +
+		                 cond_bswap_32(shdr->sh_size, do_swap),
+		               elf_size);
+
+		/* step to next header */
+		shdr = (struct shdr32 *)(((uint8_t *)shdr) + entsize);
+	}
+
+	elf_size = ROUNDUP(elf_size, 4);
+	if (elf_size > buffer_size)
+		return -1;
+
+	return elf_size;
+}
diff --git a/lib/libelf/elf64.c b/lib/libelf/elf64.c
index 775cdee..c35050d 100644
--- a/lib/libelf/elf64.c
+++ b/lib/libelf/elf64.c
@@ -20,6 +20,7 @@
 #include <stdio.h>
 #include <libelf.h>
 #include <byteorder.h>
+#include <helpers.h>
 
 struct ehdr64
 {
@@ -472,3 +473,65 @@ uint32_t elf_get_eflags_64(void *file_addr)
 
 	return ehdr->e_flags;
 }
+
+/*
+ * Determine the size of an ELF image that has been loaded into
+ * a buffer larger than its size. We search all program headers
+ * and sections for the one that shows the farthest extent of the
+ * file.
+ * @return Return -1 on error, size of file otherwise.
+ */
+int elf_get_file_size64(const void *buffer, const long buffer_size)
+{
+	const struct ehdr64 *ehdr = (const struct ehdr64 *) buffer;
+	const void *buffer_end = buffer + buffer_size;
+	const struct phdr64 *phdr;
+	const struct shdr64 *shdr;
+	long elf_size = -1;
+	uint16_t entsize;
+	int do_swap;
+	unsigned i;
+
+	if (buffer_size < sizeof(struct ehdr) || ehdr->e_ehsize != 64)
+		return -1;
+
+#ifdef __BIG_ENDIAN__
+	do_swap = ehdr->ei_data != ELFDATA2MSB;
+#else
+	do_swap = ehdr->ei_data != ELFDATA2LSB;
+#endif
+
+	phdr = buffer + cond_bswap_64(ehdr->e_phoff, do_swap);
+	entsize = cond_bswap_16(ehdr->e_phentsize, do_swap);
+	for (i = 0; i < cond_bswap_16(ehdr->e_phnum, do_swap); i++) {
+		if ((void *)phdr + entsize > buffer_end)
+			return -1;
+
+		elf_size = MAX(cond_bswap_64(phdr->p_offset, do_swap) +
+			         cond_bswap_64(phdr->p_filesz, do_swap),
+			       elf_size);
+
+		/* step to next header */
+		phdr = (struct phdr64 *)(((uint8_t *)phdr) + entsize);
+	}
+
+	shdr = buffer + cond_bswap_64(ehdr->e_shoff, do_swap);
+	entsize = cond_bswap_16(ehdr->e_shentsize, do_swap);
+	for (i = 0; i < cond_bswap_16(ehdr->e_shnum, do_swap); i++) {
+		if ((void *)shdr + entsize > buffer_end)
+			return -1;
+
+		elf_size = MAX(cond_bswap_64(shdr->sh_offset, do_swap) +
+		                 cond_bswap_64(shdr->sh_size, do_swap),
+		               elf_size);
+
+		/* step to next header */
+		shdr = (struct shdr64 *)(((uint8_t *)shdr) + entsize);
+	}
+
+	elf_size = ROUNDUP(elf_size, 4);
+	if (elf_size > buffer_size)
+		return -1;
+
+	return elf_size;
+}
