canoeboot
/
cbmk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

util/nvmutil: Further reduce memory usage 

Allocate memory based on nf instead of partsize.

nf is the number of bytes actually read from each
part of the file.

Now if the user is running setmac for example,
256 bytes of memory will be allocated regardless
of gbe file size, whereas it would have previously
allocated 8KB, 16KB or 128KB depending on the file.

Signed-off-by: Leah Rowe <leah@libreboot.org>
master
Leah Rowe 2025-01-26 07:05:06 +00:00
parent af6d6d6d59
commit 741ef57efc
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
util/nvmutil/nvmutil.c
View File

@ -198,10 +198,6 @@ openFiles(const char *path)
void
readGbe(void)
{
char *buf = malloc(partsize << 1);
if (buf == NULL)
err(errno, "Can't malloc %ld B for '%s'", partsize, filename);
if ((cmd == writeGbe) || (cmd == cmd_copy))
nf = partsize; /* read/write the entire block */
else
@ -210,9 +206,13 @@ readGbe(void)
if ((cmd == cmd_copy) || (cmd == cmd_setchecksum) || (cmd == cmd_brick))
skipread[part ^ 1] = 1; /* only read the user-specified part */
char *buf = malloc(nf << 1);
if (buf == NULL)
err(errno, "Can't malloc %ld B for '%s'", partsize, filename);
/* we pread per-part, so each part has its own pointer: */
gbe[0] = (size_t) buf;
gbe[1] = gbe[0] + partsize;
gbe[1] = gbe[0] + nf;
for (int p = 0; p < 2; p++) {
if (skipread[p])