Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

mkboot: fix the buffer size used for constructing the final firmware image

Browse source 
It was short by a fair number of bytes which could be reached when
attempting to insert bootloaders near the maximum size of 64k. This
ensures even the largest acceptable bootloader will not overflow the
buffer.

Change-Id: I8fbc92d4e3452192bf47104d7a32b49248eefc0e
This commit is contained in:
James Buren 2020-11-16 18:23:30 +00:00
parent 63691ad106
commit 64ea644269
1 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
tools/mkboot.c
View file

@ -23,6 +23,13 @@
#include <string.h> #include <string.h>
#include "mkboot.h" #include "mkboot.h"
#define SECTOR_SIZE 0x200
#define RAW_IMAGE_SIZE 0x400000
#define TOTAL_IMAGE_SIZE (RAW_IMAGE_SIZE + HEADER2_SIZE)
#define ALIGNED_IMAGE_SIZE (TOTAL_IMAGE_SIZE + SECTOR_SIZE - (TOTAL_IMAGE_SIZE % SECTOR_SIZE))
#define HEADER1_SIZE SECTOR_SIZE
#define HEADER2_SIZE 0x20
#ifndef RBUTIL #ifndef RBUTIL
static void usage(void) static void usage(void)
{ {
@ -63,7 +70,12 @@ int main(int argc, char *argv[])
} }
#endif #endif
static unsigned char image[0x400000 + 0x220 + 0x400000/0x200]; /*
* initial header size plus
* the rounded up size (includes the raw data and its length header) plus
* the checksums for the raw data and its length header
*/
static unsigned char image[ALIGNED_IMAGE_SIZE + HEADER1_SIZE + ALIGNED_IMAGE_SIZE / SECTOR_SIZE];
int mkboot_iriver(const char* infile, const char* bootfile, const char* outfile, int origin) int mkboot_iriver(const char* infile, const char* bootfile, const char* outfile, int origin)
{ {