From 2b4e46345f5e1fbf90167d9bb13c4d97c7c2fbdf Mon Sep 17 00:00:00 2001 From: Anna Kiri Date: Tue, 26 May 2026 19:10:36 +0200 Subject: [PATCH] mtd: imagetag: remove unused imagestart variable The imagestart variable was assigned sizeof(tag) (which incorrectly computed the pointer size rather than the struct size), but was never actually read after the assignment in either trx_fixup() or mtd_fixtrx(). The CRC calculations that follow use offsetof(struct bcm_tag, header_crc) directly. Remove the dead variable and its assignments entirely rather than fixing the sizeof expression. No functional change. Signed-off-by: Anna Kiri Link: https://github.com/openwrt/openwrt/pull/23546 Signed-off-by: Jonas Jelonek --- package/system/mtd/src/imagetag.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/package/system/mtd/src/imagetag.c b/package/system/mtd/src/imagetag.c index 84aadf9cd6e..d230c6062f0 100644 --- a/package/system/mtd/src/imagetag.c +++ b/package/system/mtd/src/imagetag.c @@ -178,10 +178,10 @@ trx_fixup(int fd, const char *name) int bfd; struct bcm_tag *tag; ssize_t res; - uint32_t cfelen, imagelen, imagestart, rootfslen; + uint32_t cfelen, imagelen, rootfslen; uint32_t imagecrc, rootfscrc, headercrc; uint32_t offset = 0; - cfelen = imagelen = imagestart = imagecrc = rootfscrc = headercrc = rootfslen = 0; + cfelen = imagelen = imagecrc = rootfscrc = headercrc = rootfslen = 0; if (ioctl(fd, MEMGETINFO, &mtdInfo) < 0) { @@ -219,7 +219,6 @@ trx_fixup(int fd, const char *name) sprintf(&tag->root_length[0], "%u", 0); strncpy(&tag->total_length[0], &tag->kernel_length[0], IMAGE_LEN); - imagestart = sizeof(tag); memcpy(&tag->image_crc, &tag->kernel_crc, sizeof(uint32_t)); memcpy(&tag->fskernel_crc, &tag->kernel_crc, sizeof(uint32_t)); rootfscrc = CRC_START; @@ -295,9 +294,9 @@ mtd_fixtrx(const char *mtd, size_t offset, size_t data_size) char *buf; ssize_t res; size_t block_offset; - uint32_t cfelen, imagelen, imagestart, rootfslen; + uint32_t cfelen, imagelen, rootfslen; uint32_t imagecrc, rootfscrc, headercrc; - cfelen = imagelen = imagestart = imagecrc = rootfscrc = headercrc = rootfslen = 0; + cfelen = imagelen = imagecrc = rootfscrc = headercrc = rootfslen = 0; if (data_size) fprintf(stderr, "Specifying data size in unsupported for imagetag\n"); @@ -372,7 +371,6 @@ mtd_fixtrx(const char *mtd, size_t offset, size_t data_size) fprintf(stderr, "Recalculating CRCs.\n"); } - imagestart = sizeof(tag); memcpy(&tag->image_crc, &tag->kernel_crc, sizeof(uint32_t)); memcpy(&tag->fskernel_crc, &tag->kernel_crc, sizeof(uint32_t)); rootfscrc = CRC_START; -- 2.47.3