shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-01-07 21:18:41 +03:00
Code

Merge 1b8cf8baf3 into 1737bc0c1e

Browse Source
This commit is contained in:
wrvsrx 2024-12-30 19:59:30 +01:00 committed by GitHub
commit 09664a2759
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/basic/efivars.c
View File

@ -96,6 +96,20 @@ int efi_get_variable(
(void) usleep_safe(EFI_RETRY_DELAY); (void) usleep_safe(EFI_RETRY_DELAY);
} }
/* Unfortunately kernel reports EOF if there's an inconsistency between efivarfs var list
* and what's actually stored in firmware, c.f. #34304.
* Hence we translate EOF back to ENOENT here, as with kernel behavior before
* https://github.com/torvalds/linux/commit/3fab70c165795431f00ddf9be8b84ddd07bd1f8f
*
* If the kernel changes behaviour (to flush dentries on resume), we can drop
* this at some point in the future. But note that the commit is 11
* years old at this point so we'll need to deal with the current behaviour for
* a long time.
*/
if (n == 0)
return log_debug_errno(SYNTHETIC_ERRNO(ENOENT),
"EFI variable %s is uncommitted", p);
if (n != sizeof(a)) if (n != sizeof(a))
return log_debug_errno(SYNTHETIC_ERRNO(EIO), return log_debug_errno(SYNTHETIC_ERRNO(EIO),
"Read %zi bytes from EFI variable %s, expected %zu.", n, p, sizeof(a)); "Read %zi bytes from EFI variable %s, expected %zu.", n, p, sizeof(a));