system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-10-15 04:43:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

efivar: handle error when reading --fromfile

Browse source 
The result of read() was stored in an unsigned variable, so the
test for a negative value would never work.

While I'm here, print a better error message for an empty file,
omitting the misleading errno message.

Reported by:	Coverity
MFC after:	1 week
Sponsored by:	Dell EMC Isilon
This commit is contained in:
Eric van Gyzen 2022-02-23 12:15:34 -06:00
parent 331b84b5db
commit d0f4e583bf
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
usr.sbin/efivar/efivar.c
View file

@ -239,8 +239,10 @@ print_var(efi_guid_t *guid, char *name)
if (data == NULL)
rep_err(1, "malloc");
datalen = read(fd, data, 64 * 1024);
if (datalen <= 0)
if ((ssize_t)datalen < 0)
rep_err(1, "read");
if (datalen == 0)
rep_errx(1, "empty file");
close(fd);
} else {
rv = efi_get_variable(*guid, name, &data, &datalen, &att);