{"id":1745932,"url":"http://patchwork.ozlabs.org/api/patches/1745932/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/patch/20230221201925.9644-43-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-43-pali@kernel.org>","list_archive_url":null,"date":"2023-02-21T20:19:08","name":"[RFC,u-boot-mvebu,42/59] tools: kwbimage: Rename imagesz to dataoff","commit_ref":"39c78724f4e79227f0c4a13bd95ca44474204a07","pull_url":null,"state":"accepted","archived":false,"hash":"894ec71c4d6d4807d82dc5adda743eaac7c442de","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-43-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/1745932/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/1745932/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=DIpYZbm2;\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=\"DIpYZbm2\";\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 4PLryW1y9Fz23yr\n\tfor ; Wed, 22 Feb 2023 07:50:11 +1100 (AEDT)","from h2850616.stratoserver.net (localhost [IPv6:::1])\n\tby phobos.denx.de (Postfix) with ESMTP id DEC6585AAA;\n\tTue, 21 Feb 2023 21:49:22 +0100 (CET)","by phobos.denx.de (Postfix, from userid 109)\n id B562885AA2; Tue, 21 Feb 2023 21:48:56 +0100 (CET)","from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217])\n (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n bits)) (No client certificate requested)\n by phobos.denx.de (Postfix) with ESMTPS id 348ED85AD0\n for ; Tue, 21 Feb 2023 21:22:44 +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 62A88611EF;\n Tue, 21 Feb 2023 20:22:35 +0000 (UTC)","by smtp.kernel.org (Postfix) with ESMTPSA id 17DADC4339C;\n Tue, 21 Feb 2023 20:22:35 +0000 (UTC)","by pali.im (Postfix)\n id C8B6D9FC; Tue, 21 Feb 2023 21:22:34 +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=1677010955;\n bh=BCxN+gNeRDCnDfEFvPVEi9jjGvzFWBBOKeh4ODE6Ngw=;\n h=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n b=DIpYZbm25V6ksGqRtJMLWl4R+gflZoUjotsiO6Tz5P5MbySMou2J0soyIzjwawArw\n j1b6OUKf1mZChR9Z5gwluO0sIWL91j+jJanL3koCbSTvBUt9f98mw9C05fkQgodcse\n p2wAbA79QmxBu+Ef9BvJ/MKGxXQLj6nGp+4PQY4GDURZRLkuGkEzTLYkzPGU4wuRlD\n jYKiYGxPo+4QMcSfDmEfTbQUhnIg4TgCWGYSmo+47tqIDsY1yEv6rxV6Eyfv/F4S7F\n VBPeziVupYvSxkJTBl1yfjsi6Hi6GVePeaf6V8ED4IGT26ND+48aEbJU5YcicYiwFc\n /K+t8IPwj+Z3Q==","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 42/59] tools: kwbimage: Rename imagesz to\n dataoff","Date":"Tue, 21 Feb 2023 21:19:08 +0100","Message-Id":"<20230221201925.9644-43-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":"Variable imagesz in functions image_create_v0(), image_create_v1() and\nkwbimage_set_header() stores offset to data from the beginning of the main\nheader. So it is not image size.\n\nSigned-off-by: Pali Rohár \n---\n tools/kwbimage.c | 20 ++++++++++----------\n 1 file changed, 10 insertions(+), 10 deletions(-)","diff":"diff --git a/tools/kwbimage.c b/tools/kwbimage.c\nindex 857af6a438a4..b32f845b7e2d 100644\n--- a/tools/kwbimage.c\n+++ b/tools/kwbimage.c\n@@ -962,7 +962,7 @@ static size_t image_headersz_v0(int *hasext)\n \treturn image_headersz_align(headersz, image_get_bootfrom());\n }\n \n-static void *image_create_v0(size_t *imagesz, struct image_tool_params *params,\n+static void *image_create_v0(size_t *dataoff, struct image_tool_params *params,\n \t\t\t int payloadsz)\n {\n \tstruct image_cfg_element *e;\n@@ -1050,7 +1050,7 @@ static void *image_create_v0(size_t *imagesz, struct image_tool_params *params,\n \tmain_hdr->checksum = image_checksum8(image,\n \t\t\t\t\t sizeof(struct main_hdr_v0));\n \n-\t*imagesz = headersz;\n+\t*dataoff = headersz;\n \treturn image;\n }\n \n@@ -1385,7 +1385,7 @@ static void finish_register_set_header_v1(uint8_t **cur, uint8_t **next_ext,\n \t*datai = 0;\n }\n \n-static void *image_create_v1(size_t *imagesz, struct image_tool_params *params,\n+static void *image_create_v1(size_t *dataoff, struct image_tool_params *params,\n \t\t\t uint8_t *ptr, int payloadsz)\n {\n \tstruct image_cfg_element *e;\n@@ -1532,7 +1532,7 @@ static void *image_create_v1(size_t *imagesz, struct image_tool_params *params,\n \t\t\t\t\t image, headersz, secure_hdr))\n \t\treturn NULL;\n \n-\t*imagesz = headersz;\n+\t*dataoff = headersz;\n \n \t/* Fill the real header size without padding into the main header */\n \theadersz = sizeof(*main_hdr);\n@@ -1811,7 +1811,7 @@ static void kwbimage_set_header(void *ptr, struct stat *sbuf, int ifd,\n \tFILE *fcfg;\n \tvoid *image = NULL;\n \tint version;\n-\tsize_t headersz = 0;\n+\tsize_t dataoff = 0;\n \tsize_t datasz;\n \tuint32_t checksum;\n \tstruct stat s;\n@@ -1862,11 +1862,11 @@ static void kwbimage_set_header(void *ptr, struct stat *sbuf, int ifd,\n \t\t */\n \tcase -1:\n \tcase 0:\n-\t\timage = image_create_v0(&headersz, params, datasz + 4);\n+\t\timage = image_create_v0(&dataoff, params, datasz + 4);\n \t\tbreak;\n \n \tcase 1:\n-\t\timage = image_create_v1(&headersz, params, ptr, datasz + 4);\n+\t\timage = image_create_v1(&dataoff, params, ptr, datasz + 4);\n \t\tbreak;\n \n \tdefault:\n@@ -1884,12 +1884,12 @@ static void kwbimage_set_header(void *ptr, struct stat *sbuf, int ifd,\n \tfree(image_cfg);\n \n \t/* Build and add image data checksum */\n-\tchecksum = cpu_to_le32(image_checksum32((uint8_t *)ptr + headersz,\n+\tchecksum = cpu_to_le32(image_checksum32((uint8_t *)ptr + dataoff,\n \t\t\t\t\t\tdatasz));\n-\tmemcpy((uint8_t *)ptr + headersz + datasz, &checksum, sizeof(uint32_t));\n+\tmemcpy((uint8_t *)ptr + dataoff + datasz, &checksum, sizeof(uint32_t));\n \n \t/* Finally copy the header into the image area */\n-\tmemcpy(ptr, image, headersz);\n+\tmemcpy(ptr, image, dataoff);\n \n \tfree(image);\n }\n","prefixes":["RFC","u-boot-mvebu","42/59"]}