lkml.org 
[lkml]   [2011]   [Jun]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3/4] efivars: Use string functions in pstore_write
    Date
    Instead of open-coding the string operations for comparing the prefix of
    the variable names, use the provided utf16_* string functions.

    This patch also changes the calls to efi.set_variable to
    efivars->ops->set_variable so that the right function gets called in the
    case of gsmi (which doesn't have a valid efi structure).

    As well, make sure that we only consider variables with the right vendor
    string.

    Signed-off-by: Mike Waychison <mikew@google.com>
    ---
    drivers/firmware/efivars.c | 31 +++++++++++++++++--------------
    1 files changed, 17 insertions(+), 14 deletions(-)

    diff --git a/drivers/firmware/efivars.c b/drivers/firmware/efivars.c
    index fb1219a..f424b10 100644
    --- a/drivers/firmware/efivars.c
    +++ b/drivers/firmware/efivars.c
    @@ -511,17 +511,20 @@ static u64 efi_pstore_write(enum pstore_type_id type, int part, size_t size,
    list_for_each_entry(entry, &efivars->list, list) {
    get_var_data_locked(efivars, &entry->var);

    - for (i = 0; i < DUMP_NAME_LEN; i++) {
    - if (efi_name[i] == 0) {
    - found = entry;
    - efi.set_variable(entry->var.VariableName, &entry->var.VendorGuid,
    - EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS,
    - 0, NULL);
    - break;
    - } else if (efi_name[i] != entry->var.VariableName[i]) {
    - break;
    - }
    - }
    + if (efi_guidcmp(entry->var.VendorGuid, vendor))
    + continue;
    + if (utf16_strncmp(entry->var.VariableName, efi_name,
    + utf16_strlen(efi_name)))
    + continue;
    + /* Needs to be a prefix */
    + if (entry->var.VariableName[utf16_strlen(efi_name)] == 0)
    + continue;
    +
    + /* found */
    + found = entry;
    + efivars->ops->set_variable(entry->var.VariableName, &entry->var.VendorGuid,
    + EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS,
    + 0, NULL);
    }

    if (found)
    @@ -530,9 +533,9 @@ static u64 efi_pstore_write(enum pstore_type_id type, int part, size_t size,
    for (i = 0; i < DUMP_NAME_LEN; i++)
    efi_name[i] = name[i];

    - efi.set_variable(efi_name, &vendor,
    - EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS,
    - size, psi->buf);
    + efivars->ops->set_variable(efi_name, &vendor,
    + EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS,
    + size, psi->buf);

    spin_unlock(&efivars->lock);

    --
    1.7.3.1


    \
     
     \ /
      Last update: 2011-06-21 22:21    [W:0.025 / U:0.084 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site