From mboxrd@z Thu Jan 1 00:00:00 1970 From: Konrad Rzeszutek Wilk Subject: [PATCH v1 1/3] libelf: Preserve log callback after elf_init Date: Sat, 3 Oct 2015 14:39:48 -0400 Message-ID: <1443897590-5663-2-git-send-email-konrad.wilk@oracle.com> References: <1443897590-5663-1-git-send-email-konrad.wilk@oracle.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZiRj2-0008GO-Tz for xen-devel@lists.xenproject.org; Sat, 03 Oct 2015 18:40:05 +0000 In-Reply-To: <1443897590-5663-1-git-send-email-konrad.wilk@oracle.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xenproject.org, ian.campbell@citrix.com, ian.jackson@eu.citrix.com, jbeulich@suse.com, tim@xen.org, keir@xen.org Cc: Konrad Rzeszutek Wilk List-Id: xen-devel@lists.xenproject.org The elf_init function uses the log callback to report errors. But it also memsets the whole structure so the log callback (if set) is wiped out! This preserves the log callback function along with its states. Signed-off-by: Konrad Rzeszutek Wilk --- xen/common/libelf/libelf-loader.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/xen/common/libelf/libelf-loader.c b/xen/common/libelf/libelf-loader.c index 6f42bea..32a9724 100644 --- a/xen/common/libelf/libelf-loader.c +++ b/xen/common/libelf/libelf-loader.c @@ -27,14 +27,28 @@ elf_errorstatus elf_init(struct elf_binary *elf, const char *image_input, size_t { ELF_HANDLE_DECL(elf_shdr) shdr; uint64_t i, count, section, offset; +#ifndef __XEN__ + elf_log_callback *callback; + void *log_callback_data; +#endif + int verbose; if ( !elf_is_elfbinary(image_input, size) ) { elf_err(elf, "%s: not an ELF binary\n", __FUNCTION__); return -1; } - +#ifndef __XEN__ + callback = elf->log_callback; + log_callback_data = elf->log_caller_data; +#endif + verbose = elf->verbose; elf_memset_unchecked(elf, 0, sizeof(*elf)); +#ifndef __XEN__ + elf->log_callback = callback; + elf->log_caller_data = log_callback_data; +#endif + elf->verbose = verbose; elf->image_base = image_input; elf->size = size; elf->ehdr = ELF_MAKE_HANDLE(elf_ehdr, (elf_ptrval)image_input); -- 2.4.3