{"id":1745912,"url":"http://patchwork.ozlabs.org/api/patches/1745912/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/patch/20230221201925.9644-20-pali@kernel.org/","project":{"id":18,"url":"http://patchwork.ozlabs.org/api/projects/18/?format=json","name":"U-Boot","link_name":"uboot","list_id":"u-boot.lists.denx.de","list_email":"u-boot@lists.denx.de","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20230221201925.9644-20-pali@kernel.org>","list_archive_url":null,"date":"2023-02-21T20:18:45","name":"[RFC,u-boot-mvebu,19/59] tools: kwboot: Show image type and error parsing reasons","commit_ref":"5b039dced38162f21fa078e65b0f5fc733439fac","pull_url":null,"state":"accepted","archived":false,"hash":"b69010feea66a2cd65590c1a93862243970215a0","submitter":{"id":78810,"url":"http://patchwork.ozlabs.org/api/people/78810/?format=json","name":"Pali Rohár","email":"pali@kernel.org"},"delegate":{"id":1696,"url":"http://patchwork.ozlabs.org/api/users/1696/?format=json","username":"stroese","first_name":"Stefan","last_name":"Roese","email":"sr@denx.de"},"mbox":"http://patchwork.ozlabs.org/project/uboot/patch/20230221201925.9644-20-pali@kernel.org/mbox/","series":[{"id":343058,"url":"http://patchwork.ozlabs.org/api/series/343058/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/list/?series=343058","date":"2023-02-21T20:18:27","name":"arm: mvebu: Various fixes","version":1,"mbox":"http://patchwork.ozlabs.org/series/343058/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/1745912/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/1745912/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de\n (client-ip=85.214.62.61; helo=phobos.denx.de;\n envelope-from=u-boot-bounces@lists.denx.de; receiver=)","legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256\n header.s=k20201202 header.b=tBwMXQoW;\n\tdkim-atps=neutral","phobos.denx.de;\n dmarc=pass (p=none dis=none) header.from=kernel.org","phobos.denx.de;\n spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de","phobos.denx.de;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=kernel.org header.i=@kernel.org header.b=\"tBwMXQoW\";\n\tdkim-atps=neutral","phobos.denx.de;\n dmarc=pass (p=none dis=none) header.from=kernel.org","phobos.denx.de; spf=pass smtp.mailfrom=pali@kernel.org"],"Received":["from phobos.denx.de (phobos.denx.de [85.214.62.61])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange X25519 server-signature ECDSA (P-384))\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4PLrcw5BFxz23j7\n\tfor ; Wed, 22 Feb 2023 07:34:56 +1100 (AEDT)","from h2850616.stratoserver.net (localhost [IPv6:::1])\n\tby phobos.denx.de (Postfix) with ESMTP id 8565085B7D;\n\tTue, 21 Feb 2023 21:25:28 +0100 (CET)","by phobos.denx.de (Postfix, from userid 109)\n id 2766985B21; Tue, 21 Feb 2023 21:24:02 +0100 (CET)","from dfw.source.kernel.org (dfw.source.kernel.org\n [IPv6:2604:1380:4641:c500::1])\n (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))\n (No client certificate requested)\n by phobos.denx.de (Postfix) with ESMTPS id 4FAC785ACB\n for ; Tue, 21 Feb 2023 21:22:46 +0100 (CET)","from smtp.kernel.org (relay.kernel.org [52.25.139.140])\n (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))\n (No client certificate requested)\n by dfw.source.kernel.org (Postfix) with ESMTPS id 72DAF611DD;\n Tue, 21 Feb 2023 20:22:33 +0000 (UTC)","by smtp.kernel.org (Postfix) with ESMTPSA id 26630C433AF;\n Tue, 21 Feb 2023 20:22:33 +0000 (UTC)","by pali.im (Postfix)\n id 3AD0630CB; Tue, 21 Feb 2023 21:22:30 +0100 (CET)"],"X-Spam-Checker-Version":"SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de","X-Spam-Level":"","X-Spam-Status":"No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,\n DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,\n SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org;\n s=k20201202; t=1677010953;\n bh=iC5nYd8DcnzBBbOv8EJX8BLa2FqtXpRb5IKZtaap+ls=;\n h=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n b=tBwMXQoWhlXz+EMQV+HuU4aX6naYJoqwZY09k1uh116C/siyTp0zwlqFcDfY30H+i\n lkKulVomUgOsF5q+cvfzWhSIXIKs1b7z6TqngByhO40XYOo++zrAz25Ou351ydOKcM\n RmIuLxy01rp88baEwif38x5qj1tTTI/K07IvlwKIeE33I2RtdQQtCl4qLO55Df+/tV\n 2cya58y/r8xsusqWL+/IUkJP60w1qorap+J1A92Al7qPvHi5wQ6WMmQa81sedqD0zb\n 8LA7zkcoPh5TqrSiW6WS15jPQNnNQVKhcdweWEVj30mDvfAsopX3sZUHFw333Fn9qd\n aAFSmyeNEdXkA==","From":"=?utf-8?q?Pali_Roh=C3=A1r?= ","To":"u-boot@lists.denx.de","Cc":"Stefan Roese , Tony Dinh ,\n Josua Mayer ","Subject":"[PATCH RFC u-boot-mvebu 19/59] tools: kwboot: Show image type and\n error parsing reasons","Date":"Tue, 21 Feb 2023 21:18:45 +0100","Message-Id":"<20230221201925.9644-20-pali@kernel.org>","X-Mailer":"git-send-email 2.20.1","In-Reply-To":"<20230221201925.9644-1-pali@kernel.org>","References":"<20230221201925.9644-1-pali@kernel.org>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","X-BeenThere":"u-boot@lists.denx.de","X-Mailman-Version":"2.1.39","Precedence":"list","List-Id":"U-Boot discussion ","List-Unsubscribe":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","Errors-To":"u-boot-bounces@lists.denx.de","Sender":"\"U-Boot\" ","X-Virus-Scanned":"clamav-milter 0.103.6 at phobos.denx.de","X-Virus-Status":"Clean"},"content":"Show image type and version during parsing of kwbimage.\nAnd show reasons in error messages when parsing failed.\nThis can help to debug issues with invalid images.\n\nSigned-off-by: Pali Rohár \n---\n tools/kwboot.c | 39 ++++++++++++++++++++++++++++++++++-----\n 1 file changed, 34 insertions(+), 5 deletions(-)","diff":"diff --git a/tools/kwboot.c b/tools/kwboot.c\nindex cb31d5b858ce..7c666486f31f 100644\n--- a/tools/kwboot.c\n+++ b/tools/kwboot.c\n@@ -1976,6 +1976,21 @@ _inject_baudrate_change_code(void *img, size_t *size, int for_data,\n \t}\n }\n \n+static const char *\n+kwboot_img_type(uint8_t blockid)\n+{\n+\tswitch (blockid) {\n+\tcase IBR_HDR_I2C_ID: return \"I2C\";\n+\tcase IBR_HDR_SPI_ID: return \"SPI\";\n+\tcase IBR_HDR_NAND_ID: return \"NAND\";\n+\tcase IBR_HDR_SATA_ID: return \"SATA\";\n+\tcase IBR_HDR_PEX_ID: return \"PEX\";\n+\tcase IBR_HDR_UART_ID: return \"UART\";\n+\tcase IBR_HDR_SDIO_ID: return \"SDIO\";\n+\tdefault: return \"unknown\";\n+\t}\n+}\n+\n static int\n kwboot_img_patch(void *img, size_t *size, int baudrate)\n {\n@@ -1989,8 +2004,10 @@ kwboot_img_patch(void *img, size_t *size, int baudrate)\n \n \thdr = img;\n \n-\tif (*size < sizeof(struct main_hdr_v1))\n+\tif (*size < sizeof(struct main_hdr_v1)) {\n+\t\tfprintf(stderr, \"Invalid image header size\\n\");\n \t\tgoto err;\n+\t}\n \n \timage_ver = kwbimage_version(img);\n \tif (image_ver != 0 && image_ver != 1) {\n@@ -2000,12 +2017,18 @@ kwboot_img_patch(void *img, size_t *size, int baudrate)\n \n \thdrsz = kwbheader_size(hdr);\n \n-\tif (*size < hdrsz)\n+\tif (*size < hdrsz) {\n+\t\tfprintf(stderr, \"Invalid image header size\\n\");\n \t\tgoto err;\n+\t}\n+\n+\tkwboot_printv(\"Detected kwbimage v%d with %s boot signature\\n\", image_ver, kwboot_img_type(hdr->blockid));\n \n \tcsum = kwboot_hdr_csum8(hdr) - hdr->checksum;\n-\tif (csum != hdr->checksum)\n+\tif (csum != hdr->checksum) {\n+\t\tfprintf(stderr, \"Image has invalid header checksum stored in image header\\n\");\n \t\tgoto err;\n+\t}\n \n \tsrcaddr = le32_to_cpu(hdr->srcaddr);\n \n@@ -2028,9 +2051,15 @@ kwboot_img_patch(void *img, size_t *size, int baudrate)\n \t\tbreak;\n \t}\n \n-\tif (hdrsz > le32_to_cpu(hdr->srcaddr) ||\n-\t *size < le32_to_cpu(hdr->srcaddr) + le32_to_cpu(hdr->blocksize))\n+\tif (hdrsz > le32_to_cpu(hdr->srcaddr)) {\n+\t\tfprintf(stderr, \"Image has invalid data offset stored in image header\\n\");\n+\t\tgoto err;\n+\t}\n+\n+\tif (*size < le32_to_cpu(hdr->srcaddr) + le32_to_cpu(hdr->blocksize)) {\n+\t\tfprintf(stderr, \"Image has invalid data size stored in image header\\n\");\n \t\tgoto err;\n+\t}\n \n \tfor_each_opt_hdr_v1 (ohdr, hdr) {\n \t\tif (!opt_hdr_v1_valid_size(ohdr, (const uint8_t *)hdr + hdrsz)) {\n","prefixes":["RFC","u-boot-mvebu","19/59"]}