{"id":809646,"url":"http://patchwork.ozlabs.org/api/patches/809646/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/1504527967-29248-18-git-send-email-peter.maydell@linaro.org/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<1504527967-29248-18-git-send-email-peter.maydell@linaro.org>","list_archive_url":null,"date":"2017-09-04T12:25:48","name":"[PULL,17/36] loader: Ignore zero-sized ELF segments","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"e77e6d91992cef5c576784708d831ba4f5cb9e70","submitter":{"id":5111,"url":"http://patchwork.ozlabs.org/api/people/5111/?format=json","name":"Peter Maydell","email":"peter.maydell@linaro.org"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/1504527967-29248-18-git-send-email-peter.maydell@linaro.org/mbox/","series":[{"id":1366,"url":"http://patchwork.ozlabs.org/api/series/1366/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=1366","date":"2017-09-04T12:25:36","name":"[PULL,01/36] target/arm: Use MMUAccessType enum rather than int","version":1,"mbox":"http://patchwork.ozlabs.org/series/1366/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/809646/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/809646/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":"ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xm8cz5h2Cz9t2Z\n\tfor ;\n\tMon, 4 Sep 2017 22:42:27 +1000 (AEST)","from localhost ([::1]:59622 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1doqht-0008Mb-Ot\n\tfor incoming@patchwork.ozlabs.org; Mon, 04 Sep 2017 08:42:25 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:52604)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1doqST-00051d-3g\n\tfor qemu-devel@nongnu.org; Mon, 04 Sep 2017 08:26:44 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1doqSF-0004nw-AS\n\tfor qemu-devel@nongnu.org; Mon, 04 Sep 2017 08:26:29 -0400","from orth.archaic.org.uk ([2001:8b0:1d0::2]:37120)\n\tby eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from )\n\tid 1doqSF-0004nZ-3a\n\tfor qemu-devel@nongnu.org; Mon, 04 Sep 2017 08:26:15 -0400","from pm215 by orth.archaic.org.uk with local (Exim 4.89)\n\t(envelope-from ) id 1doqSE-0005Wj-4U\n\tfor qemu-devel@nongnu.org; Mon, 04 Sep 2017 13:26:14 +0100"],"From":"Peter Maydell ","To":"qemu-devel@nongnu.org","Date":"Mon, 4 Sep 2017 13:25:48 +0100","Message-Id":"<1504527967-29248-18-git-send-email-peter.maydell@linaro.org>","X-Mailer":"git-send-email 2.7.4","In-Reply-To":"<1504527967-29248-1-git-send-email-peter.maydell@linaro.org>","References":"<1504527967-29248-1-git-send-email-peter.maydell@linaro.org>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","X-detected-operating-system":"by eggs.gnu.org: Genre and OS details not\n\trecognized.","X-Received-From":"2001:8b0:1d0::2","Subject":"[Qemu-devel] [PULL 17/36] loader: Ignore zero-sized ELF segments","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"Some ELF files have program headers that specify segments that\nare of zero size. Ignore them, rather than trying to create\nzero-length ROM blobs for them, because the zero-length blob\ncan falsely trigger the overlapping-ROM-blobs check.\n\nSigned-off-by: Peter Maydell \nReviewed-by: Philippe Mathieu-Daudé \nReviewed-by: Richard Henderson \nTested-by: Hua Yanghao \nMessage-id: 1502116754-18867-3-git-send-email-peter.maydell@linaro.org\n---\n include/hw/elf_ops.h | 24 +++++++++++++++++-------\n 1 file changed, 17 insertions(+), 7 deletions(-)","diff":"diff --git a/include/hw/elf_ops.h b/include/hw/elf_ops.h\nindex 2e526d3..d192e7e 100644\n--- a/include/hw/elf_ops.h\n+++ b/include/hw/elf_ops.h\n@@ -451,14 +451,24 @@ static int glue(load_elf, SZ)(const char *name, int fd,\n *pentry = ehdr.e_entry - ph->p_vaddr + ph->p_paddr;\n }\n \n- if (load_rom) {\n- snprintf(label, sizeof(label), \"phdr #%d: %s\", i, name);\n-\n- /* rom_add_elf_program() seize the ownership of 'data' */\n- rom_add_elf_program(label, data, file_size, mem_size, addr, as);\n- } else {\n- cpu_physical_memory_write(addr, data, file_size);\n+ if (mem_size == 0) {\n+ /* Some ELF files really do have segments of zero size;\n+ * just ignore them rather than trying to create empty\n+ * ROM blobs, because the zero-length blob can falsely\n+ * trigger the overlapping-ROM-blobs check.\n+ */\n g_free(data);\n+ } else {\n+ if (load_rom) {\n+ snprintf(label, sizeof(label), \"phdr #%d: %s\", i, name);\n+\n+ /* rom_add_elf_program() seize the ownership of 'data' */\n+ rom_add_elf_program(label, data, file_size, mem_size,\n+ addr, as);\n+ } else {\n+ cpu_physical_memory_write(addr, data, file_size);\n+ g_free(data);\n+ }\n }\n \n total_size += mem_size;\n","prefixes":["PULL","17/36"]}