shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-10-28 11:55:23 +03:00
Code

bootctl: clean up get_file_version()

Browse Source 
Make sure that we always initialize the return parameter on success, and that
all errors result in an error message, not just some.
This commit is contained in:
Lennart Poettering 2016-07-19 20:46:17 +02:00
parent 5fa6c13c7b
commit db6d9faeb0
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/boot/bootctl.c
View File

@ -275,14 +275,16 @@ static int get_file_version(int fd, char **v) {
assert(v);
if (fstat(fd, &st) < 0)
return -errno;
return log_error_errno(errno, "Failed to stat EFI binary: %m");
if (st.st_size < 27)
if (st.st_size < 27) {
*v = NULL;
return 0;
}
buf = mmap(NULL, st.st_size, PROT_READ, MAP_PRIVATE, fd, 0);
if (buf == MAP_FAILED)
return -errno;
return log_error_errno(errno, "Failed to memory map EFI binary: %m");
s = memmem(buf, st.st_size - 8, "#### LoaderInfo: ", 17);
if (!s)
@ -304,7 +306,7 @@ static int get_file_version(int fd, char **v) {
r = 1;
finish:
munmap(buf, st.st_size);
(void) munmap(buf, st.st_size);
*v = x;
return r;
}