Skip to content

Commit

Permalink
efivar: Copy VarToFile to RTStorageVolatile file at ESP
Browse files Browse the repository at this point in the history
EFI is becoming more common on embedded boards with the embracing of
SystemReady-IR.

U-Boot which is most commonly used, is usually storing the EFI variables
in a file in the ESP. That makes it impossible to support SetVariable at
Runtime reliably, since the OS doesn't know how to access, read or write
that file.

OS'es usually need SetVariable at runtime for three reasons:

- Set the BootOrder
- Enable UEFI Secure Boot
- OSIndication to signal capsule updates on-disk

Since the variables are stored in a file U-Boot enables SetVariable at
runtime in the EFI config table and stores any updates in RAM. At the
same file it creates two volatile variables:

- RTStorageVolatile is the location of the file relative to the ESP
- VarTofile contains a binary dump of the EFI variables that need to be
  preserved on the file (BS, RT, NV)

U-Boot fills in the VarToFile dynamically on reads and that includes any
updates the OS did in the meantime.

So, let's update efivar to do the same thing. Once a variable is written
to the efivarfs, make sure efivars is mounted as rw and scan for the
file RTStorageVolatile. If we find that, copy the VarToFile contents in
a file and preserve the variables across reboots.

Suggested-by: Ilias Apalodimas <[email protected]>
Signed-off-by: Javier Tia <[email protected]>
  • Loading branch information
jetm committed Oct 25, 2024
1 parent 2491825 commit 1ddad0e
Show file tree
Hide file tree
Showing 5 changed files with 140 additions and 2 deletions.
4 changes: 4 additions & 0 deletions src/efivarfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -312,6 +312,8 @@ efivarfs_del_variable(efi_guid_t guid, const char *name)
if (rc < 0)
efi_error("unlink failed");

efi_save_esp_filename();

__typeof__(errno) errno_value = errno;
free(path);
errno = errno_value;
Expand Down Expand Up @@ -442,6 +444,8 @@ efivarfs_set_variable(efi_guid_t guid, const char *name, const uint8_t *data,
goto err;
}

efi_save_esp_filename();

/* we're done */
ret = 0;

Expand Down
2 changes: 2 additions & 0 deletions src/include/efivar/efivar.h
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,8 @@ extern int efi_variable_get_attributes(efi_variable_t *var, uint64_t *attrs)
extern int efi_variable_realize(efi_variable_t *var)
__attribute__((__nonnull__ (1)));

extern void efi_save_esp_filename(void);

#ifndef EFIVAR_BUILD_ENVIRONMENT
extern int efi_error_get(unsigned int n,
char ** const filename,
Expand Down
126 changes: 126 additions & 0 deletions src/lib.c
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,19 @@

#include "efivar.h"

#define VAR2FILE "/sys/firmware/efi/efivars/VarToFile-b2ac5fc9-92b7-4acd-aeac-11e818c3130c"

// RTStorageVolatile-b2ac5fc9-92b7-4acd-aeac-11e818c3130c
#define NAME_RTSV "RTStorageVolatile"
#define GUID_RTSV \
EFI_GUID(0xB2AC5FC9,0x92B7,0x4ACD,0xAEAC,0x11,0xE8,0x18,0xC3,0x13,0x0C)

static const char *esp_paths[] = {
"/boot",
"/boot/efi",
"/efi"
};

static int default_probe(void)
{
return 1;
Expand Down Expand Up @@ -227,6 +240,119 @@ efi_variables_supported(void)
return 1;
}

static void
search_esp_filename(const char *filename, char **esp_filename)
{
size_t num_paths = sizeof(esp_paths) / sizeof(esp_paths[0]);
size_t esp_filename_size = 0;

for (size_t i = 0; i < num_paths; ++i) {
esp_filename_size = strlen(esp_paths[i]) + strlen(filename) + 2;
*esp_filename = malloc(esp_filename_size);
if (!*esp_filename) {
fprintf(stderr, "Error: failed to allocate memory for esp_filename\n");
exit(1);
}
snprintf(*esp_filename, esp_filename_size, "%s/%s", esp_paths[i], filename);

struct stat buffer;
if (stat(*esp_filename, &buffer) == 0) {
return;
}

free(*esp_filename);
*esp_filename = NULL;
}
}

static int
get_esp_filename(char **esp_filename)
{
size_t filename_size;
uint32_t filename_attr;
uint8_t *filename = NULL;
int rc = 0;

rc = efi_get_variable(GUID_RTSV, NAME_RTSV, &filename, &filename_size, &filename_attr);
if (rc < 0) {
fprintf(stderr, "efivar: Error %d getting filename from RTStorageVolatile\n", rc);
return rc;
}

*esp_filename = (char *)filename;

return 0;
}

static void
save_esp_filename(const char *esp_filename) {
FILE *var2file = NULL;
FILE *output_file = NULL;
unsigned char buffer[1024];
size_t bytes_read, bytes_written;
bool fail = false;

var2file = fopen(VAR2FILE, "rb");
if (!var2file) {
fprintf(stderr, "Error: Could not open input file '%s'\n", VAR2FILE);
exit(1);
}

output_file = fopen(esp_filename, "wb");
if (!output_file) {
fprintf(stderr, "Error: Could not open output file '%s'\n", esp_filename);
fclose(var2file);
exit(1);
}

if (fread(buffer, 1, 4, var2file) < 4) {
fprintf(stderr, "Error: Could not skip first 4 bytes or file is too small\n");
fail = true;
goto clean;
}

while ((bytes_read = fread(buffer, 1, sizeof(buffer), var2file)) > 0) {
bytes_written = fwrite(buffer, 1, bytes_read, output_file);
if (bytes_written != bytes_read) {
fprintf(stderr, "Error: Could not write data to output file\n");
fail = true;
goto clean;
}
}

clean:
fclose(var2file);
fclose(output_file);
if (fail)
exit(1);
}

void PUBLIC
efi_save_esp_filename(void)
{
int rc = 0;
char *esp_filename = NULL;
char *esp_filename_path = NULL;

rc = get_esp_filename(&esp_filename);
if (rc < 0 || !esp_filename) {
goto cleanup;
}

search_esp_filename(esp_filename, &esp_filename_path);
if (esp_filename_path) {
save_esp_filename(esp_filename_path);
}
else {
fprintf(stderr, "Error: no file found in ESP part to save VarToFile\n");
goto cleanup;
}

cleanup:
free(esp_filename);
free(esp_filename_path);
}

static void CONSTRUCTOR libefivar_init(void);

static void CONSTRUCTOR
Expand Down
2 changes: 2 additions & 0 deletions src/libefivar.map.in
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,8 @@ libefivar.so.0 {
efi_guid_x509_sha384;
efi_guid_x509_sha512;
efi_guid_zero;

efi_save_esp_filename;
local: *;
};

Expand Down
8 changes: 6 additions & 2 deletions src/vars.c
Original file line number Diff line number Diff line change
Expand Up @@ -435,8 +435,10 @@ vars_del_variable(efi_guid_t guid, const char *name)
}

rc = write(fd, buf, buf_size);
if (rc >= 0)
if (rc >= 0) {
efi_save_esp_filename();
ret = 0;
}
else
efi_error("write() failed");
err:
Expand Down Expand Up @@ -594,8 +596,10 @@ vars_set_variable(efi_guid_t guid, const char *name, const uint8_t *data,
rc = write(fd, &var32, sizeof(var32));
}

if (rc >= 0)
if (rc >= 0) {
efi_save_esp_filename();
ret = 0;
}
else
efi_error("write() failed");

Expand Down

0 comments on commit 1ddad0e

Please sign in to comment.