catspeed-cc/openwrt
1
1
Fork 0
Code

mtd: imagetag: remove unused imagestart variable

Browse Source 
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 <bredcorn@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/23546
Signed-off-by: Jonas Jelonek <jelonek.jonas@gmail.com>
This commit is contained in:
Anna Kiri 2026-05-26 19:10:36 +02:00 committed by Jonas Jelonek
parent d0520b880d
commit 2b4e46345f
No known key found for this signature in database
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
package/system/mtd/src/imagetag.c
View File

@ -178,10 +178,10 @@ trx_fixup(int fd, const char *name)
int bfd; int bfd;
struct bcm_tag *tag; struct bcm_tag *tag;
ssize_t res; ssize_t res;
uint32_t cfelen, imagelen, imagestart, rootfslen; uint32_t cfelen, imagelen, rootfslen;
uint32_t imagecrc, rootfscrc, headercrc; uint32_t imagecrc, rootfscrc, headercrc;
uint32_t offset = 0; 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) { if (ioctl(fd, MEMGETINFO, &mtdInfo) < 0) {
@ -219,7 +219,6 @@ trx_fixup(int fd, const char *name)
sprintf(&tag->root_length[0], "%u", 0); sprintf(&tag->root_length[0], "%u", 0);
strncpy(&tag->total_length[0], &tag->kernel_length[0], IMAGE_LEN); 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->image_crc, &tag->kernel_crc, sizeof(uint32_t));
memcpy(&tag->fskernel_crc, &tag->kernel_crc, sizeof(uint32_t)); memcpy(&tag->fskernel_crc, &tag->kernel_crc, sizeof(uint32_t));
rootfscrc = CRC_START; rootfscrc = CRC_START;
@ -295,9 +294,9 @@ mtd_fixtrx(const char *mtd, size_t offset, size_t data_size)
char *buf; char *buf;
ssize_t res; ssize_t res;
size_t block_offset; size_t block_offset;
uint32_t cfelen, imagelen, imagestart, rootfslen; uint32_t cfelen, imagelen, rootfslen;
uint32_t imagecrc, rootfscrc, headercrc; uint32_t imagecrc, rootfscrc, headercrc;
cfelen = imagelen = imagestart = imagecrc = rootfscrc = headercrc = rootfslen = 0; cfelen = imagelen = imagecrc = rootfscrc = headercrc = rootfslen = 0;
if (data_size) if (data_size)
fprintf(stderr, "Specifying data size in unsupported for imagetag\n"); 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"); fprintf(stderr, "Recalculating CRCs.\n");
} }
imagestart = sizeof(tag);
memcpy(&tag->image_crc, &tag->kernel_crc, sizeof(uint32_t)); memcpy(&tag->image_crc, &tag->kernel_crc, sizeof(uint32_t));
memcpy(&tag->fskernel_crc, &tag->kernel_crc, sizeof(uint32_t)); memcpy(&tag->fskernel_crc, &tag->kernel_crc, sizeof(uint32_t));
rootfscrc = CRC_START; rootfscrc = CRC_START;