coja/lbmk
1
0
Fork 0
mirror of https://codeberg.org/libreboot/lbmk.git synced 2026-07-11 22:12:40 +02:00
Code Issues Packages Projects Releases Wiki Activity
3,772 Commits 22 Branches 45 Tags
2c66b813ef18bf8e31bc15dc7023b843a710e080
Commit Graph

3772 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Leah Rowe 2c66b813ef util/nvmutil: stricter lseep_loop return offset 
we currently reset just fine, but a partial success
where the previous offset is not the same as the
original should also be considered failure.

this patch therefore makes the return much stricter,
making the code return an error if this occurs,
which in nvmutil would then cause a program exit.

Signed-off-by: Leah Rowe <leah@libreboot.org>
 2026-03-26 06:59:41 +00:00
Leah Rowe 00f92b33e1 util/nvmutil: only use srand on fallback rand 
Signed-off-by: Leah Rowe <leah@libreboot.org>
 2026-03-26 06:59:41 +00:00
Leah Rowe 0ff1cac40c nvmutil: add missing check to io_args 
accidentally removed this in a rebase

Signed-off-by: Leah Rowe <leah@libreboot.org>
 2026-03-26 06:59:41 +00:00
Leah Rowe 4b69645c88 util/nvmutil: add flock to pledge promises 
otherwise, gbe.bin locking won't work!

Signed-off-by: Leah Rowe <leah@libreboot.org>
 2026-03-26 06:59:41 +00:00
Leah Rowe 46bbb4d8e4 util/nvmutil: tidy up io_args 
i don't like it grouped together. do it
all separate, for clarity.

Signed-off-by: Leah Rowe <leah@libreboot.org>
 2026-03-26 06:59:41 +00:00
Leah Rowe 402f5cacbd util/nvmutil: tidy up err() 
Signed-off-by: Leah Rowe <leah@libreboot.org>
 2026-03-26 06:59:41 +00:00
Leah Rowe 2d46837475 util/nvmutil: re-add io_args() 
unified arg check for prw and rw_file_exact

Signed-off-by: Leah Rowe <leah@libreboot.org>
 2026-03-26 06:59:41 +00:00
Leah Rowe 7263125d60 util/nvmutil: rw_file_exact: check inputs also 
we check them in prw, but we used to rely
on prw because we called that first. no more.

it's correct to also check them here anyway,
in case i ever call another function here.

Signed-off-by: Leah Rowe <leah@libreboot.org>
 2026-03-26 06:59:41 +00:00
Leah Rowe a89747a5c8 util/nvmutil: rw_over_nrw: err if nrw is zero 
Signed-off-by: Leah Rowe <leah@libreboot.org>
 2026-03-26 06:59:41 +00:00
Leah Rowe 13006f2516 util/nvmutil: rw: safer bound check 
avoid pointer-range overflow arithmetic. this
patch doesn't change behaviour, but makes an
overflow impossible.

Signed-off-by: Leah Rowe <leah@libreboot.org>
 2026-03-26 06:59:41 +00:00
Leah Rowe f0f2e03476 util/nvmutil rw: make off_reset a toggle 
Signed-off-by: Leah Rowe <leah@libreboot.org>
 2026-03-26 06:59:41 +00:00
Leah Rowe d62780948f util/nvmutil: rw_file_exact: explicit casts 
don't do it inside functions. some compilers may
be inconsistent, ditto several auditing tools.

Signed-off-by: Leah Rowe <leah@libreboot.org>
 2026-03-26 06:59:41 +00:00
Leah Rowe 1583947625 util/nvmutil: fix potential overflow in rw 
off is signed, so converting that to unsigned
is better than converting rc (unsigned)
to signed. i had the right idea, but got
it wrong in the earlier version. this
should fix potential overflow issues.

Signed-off-by: Leah Rowe <leah@libreboot.org>
 2026-03-26 06:59:41 +00:00
Leah Rowe e4802d4013 util/nvmutil: rw file: guard rc before addition 
otherwise, it could still overflow

Signed-off-by: Leah Rowe <leah@libreboot.org>
 2026-03-26 06:59:41 +00:00
Leah Rowe 37526fc1c1 nvmutil: toggle for fd thread-safety err state 
Signed-off-by: Leah Rowe <leah@libreboot.org>
 2026-03-26 06:59:41 +00:00
Leah Rowe 1d4a57ab26 util/nvmutil: clean up pwrite/pread case 
some unused variables if enabled. hide them.

Signed-off-by: Leah Rowe <leah@libreboot.org>
 2026-03-26 06:59:41 +00:00
Leah Rowe 6d338e1fa4 util/nvmutil: partially mitigate fd offset race 
our fallback pwrite/pread behaviour still does not
properly replicate the safety of real pwrite/pread

i intend to put this i/o code into a library for use
in other programs; nvmutil is single-threaded so
this change is largely redundant (but can't hurt)

Signed-off-by: Leah Rowe <leah@libreboot.org>
 2026-03-26 06:59:41 +00:00
Leah Rowe 291c8a9a8b util/nvmutil: tidy up rw_file_exact 
Signed-off-by: Leah Rowe <leah@libreboot.org>
 2026-03-26 06:59:41 +00:00
Leah Rowe fe9900e7a1 comment 
Signed-off-by: Leah Rowe <leah@libreboot.org>
 2026-03-26 06:59:41 +00:00
Leah Rowe a78e156346 util/nvmutil: cleanup 
remove ptr casts to ulong. size_t is better.

Signed-off-by: Leah Rowe <leah@libreboot.org>
 2026-03-26 06:59:41 +00:00
Leah Rowe 4558993df4 nope, use size_t 
despite my cast, size_t is better for mem index

Signed-off-by: Leah Rowe <leah@libreboot.org>
 2026-03-26 06:59:41 +00:00
Leah Rowe ddd300493b util/nvmutil: use ulong on ptr casts 
Signed-off-by: Leah Rowe <leah@libreboot.org>
 2026-03-26 06:59:41 +00:00
Leah Rowe 2de5c6332e util/nvmutil: remove rw_file_once 
we don't need it anymore.

Signed-off-by: Leah Rowe <leah@libreboot.org>
 2026-03-26 06:59:41 +00:00
Leah Rowe 3b9761fbed util/nvmutil: move looping logic to rw_file_exact 
rw_file_once was doing what rw_file_exact should be
doing

_once does what it says: once

we were passing an offset (rc) to it that it was not
meaningfully using.

this makes the code now more robust, especially if
we later swap out or break _once - then we don't
get weird behaviour (if there is a regression).

Signed-off-by: Leah Rowe <leah@libreboot.org>
 2026-03-26 06:59:41 +00:00
Leah Rowe c825d80198 nvmutil: move increment logic to rw_file_exact 
Signed-off-by: Leah Rowe <leah@libreboot.org>
 2026-03-26 06:59:41 +00:00
Leah Rowe 4a3951a4d9 nvmutil: fix redundant check 
we already check not-zero in the next if

Signed-off-by: Leah Rowe <leah@libreboot.org>
 2026-03-26 06:59:41 +00:00
Leah Rowe a3354d2598 util/nvmutil: cast gbe file size on ptr cmp 
Signed-off-by: Leah Rowe <leah@libreboot.org>
 2026-03-26 06:59:41 +00:00
Leah Rowe 1606f79c74 util/nvmutil: even safer pointer comparison 
we assert now that ulong is the size of a pointer,
therefore we know that it can fit a pointer reliably.

this code is written for c90 spec so lacks uintptr

Signed-off-by: Leah Rowe <leah@libreboot.org>
 2026-03-26 06:59:41 +00:00
Leah Rowe b88c81869b util/nvmutil: safer pointer comparison 
technically we're never supposed to do arithmetic on
pointers (there's uintptr for that)

very anal fix

Signed-off-by: Leah Rowe <leah@libreboot.org>
 2026-03-26 06:59:41 +00:00
Leah Rowe 5b4168c763 util/nvmutil: enable arc4random on linux 
not available on older systems. can just pass
the relevant flag in the compiler:

HAVE_ARC4RANDOM_BUF=0 at build time if you need
the fallback.

Signed-off-by: Leah Rowe <leah@libreboot.org>
 2026-03-26 06:59:41 +00:00
Leah Rowe 8ccdde57e1 util/nvmutil: re-add arc4random 
Signed-off-by: Leah Rowe <leah@libreboot.org>
 2026-03-26 06:59:41 +00:00
Leah Rowe 94632f3394 util/nvmutil: 5 retries, not 10 
Signed-off-by: Leah Rowe <leah@libreboot.org>
 2026-03-26 06:59:41 +00:00
Leah Rowe 3c42608d6d util/nvmutil: check if gbe.bin is seekable 
Signed-off-by: Leah Rowe <leah@libreboot.org>
 2026-03-26 06:59:41 +00:00
Leah Rowe 5f6038af5d util/nvmutil: check inode during post-verify 
Signed-off-by: Leah Rowe <leah@libreboot.org>
 2026-03-26 06:59:41 +00:00
Leah Rowe 30e953dc8f util/nvmutil: warn about gbe.bin hard links 
Signed-off-by: Leah Rowe <leah@libreboot.org>
 2026-03-26 06:59:41 +00:00
Leah Rowe b8246acf19 util/nvmutil: guard file replacement attacks 
i already also guard other toctuo attacks :)

Signed-off-by: Leah Rowe <leah@libreboot.org>
 2026-03-26 06:59:41 +00:00
Leah Rowe e162d63ae6 util/nvmutil: guard against unlinking file 
if someone deletes gbe.bin while operating, nvmutil
will now abort

Signed-off-by: Leah Rowe <leah@libreboot.org>
 2026-03-26 06:59:41 +00:00
Leah Rowe 7eadaf2894 util/nvmutil: don't use /dev/urandom 
too over engineered and cumbersome.

the new security in prw() makes it brittle,
and i'd rather not move checks outside of it.

the fallback rand is random enough.

Signed-off-by: Leah Rowe <leah@libreboot.org>
 2026-03-26 06:59:41 +00:00
Leah Rowe 64389b696b util/nvmutil: fix file check 
Signed-off-by: Leah Rowe <leah@libreboot.org>
 2026-03-26 06:59:41 +00:00
Leah Rowe c5c629d776 util/nvmutil: fix cast check 
Signed-off-by: Leah Rowe <leah@libreboot.org>
 2026-03-26 06:59:41 +00:00
Leah Rowe ec98e3143c util/nvmutil: more aggressive file checking 
Signed-off-by: Leah Rowe <leah@libreboot.org>
 2026-03-26 06:59:41 +00:00
Leah Rowe b231e28c93 util/nvmutil: prevent overflow in rw_file_exact 
Signed-off-by: Leah Rowe <leah@libreboot.org>
 2026-03-26 06:59:41 +00:00
Leah Rowe 9ca9b54828 util/nvmutil: verify final offset in pwrite/pread 
Signed-off-by: Leah Rowe <leah@libreboot.org>
 2026-03-26 06:59:41 +00:00
Leah Rowe b86f415a3e util/nvmutil: check regular file in rw_file_exact 
Signed-off-by: Leah Rowe <leah@libreboot.org>
 2026-03-26 06:59:41 +00:00
Leah Rowe d34552b400 util/nvmutil: fix if (PWRITE) 
Signed-off-by: Leah Rowe <leah@libreboot.org>
 2026-03-26 06:59:41 +00:00
Leah Rowe 0612798ecf util/nvmutil: don't check o_append in prw 
slow, per call. prw should be generic.

do it just for gbe files, once

Signed-off-by: Leah Rowe <leah@libreboot.org>
 2026-03-26 06:59:41 +00:00
Leah Rowe 026cbacbe2 util/nvmutil: configurable eintr/eagain 
Signed-off-by: Leah Rowe <leah@libreboot.org>
 2026-03-26 06:59:41 +00:00
Leah Rowe 2eb045927b util/nvmutil: configurable retries/pread 
Signed-off-by: Leah Rowe <leah@libreboot.org>
 2026-03-26 06:59:41 +00:00
Leah Rowe 72365f6447 util/nvmutil: support real pwrite/pread 
build flag

Signed-off-by: Leah Rowe <leah@libreboot.org>
 2026-03-26 06:59:41 +00:00
Leah Rowe c27dedfeea util/nvmutil: better commented I/O functions 
Signed-off-by: Leah Rowe <leah@libreboot.org>
 2026-03-26 06:59:41 +00:00