[media] staging: atomisp: Fix calling efivar_entry_get() with unaligned arguments

efivar_entry_get has certain alignment requirements and the atomisp
platform code was not honoring these, causing an oops by triggering the
WARN_ON in arch/x86/platform/efi/efi_64.c: virt_to_phys_or_null_size().

This commit fixes this by using the members of the efivar struct embedded
in the efivar_entry struct we kzalloc as arguments to efivar_entry_get(),
which is how all the other callers of efivar_entry_get() do this.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>

diff --git a/drivers/staging/media/atomisp/platform/intel-mid/atomisp_gmin_platform.c b/drivers/staging/media/atomisp/platform/intel-mid/atomisp_gmin_platform.c
index d68e9cf33aa7adf93516a4c987af4851df326c56..fe996d0cb71c4bf513e310a7d226e1f4ef34d424 100644 (file)
--- a/drivers/staging/media/atomisp/platform/intel-mid/atomisp_gmin_platform.c
+++ b/drivers/staging/media/atomisp/platform/intel-mid/atomisp_gmin_platform.c
@@ -635,9 +635,7 @@ int gmin_get_config_var(struct device *dev, const char *var, char *out,
        char var8[CFG_VAR_NAME_MAX];
        efi_char16_t var16[CFG_VAR_NAME_MAX];
        struct efivar_entry *ev;
-       u32 efiattr_dummy;
        int i, j, ret;
-       unsigned long efilen;
 
        if (dev && ACPI_COMPANION(dev))
                dev = &ACPI_COMPANION(dev)->dev;
@@ -699,15 +697,18 @@ int gmin_get_config_var(struct device *dev, const char *var, char *out,
                return -ENOMEM;
        memcpy(&ev->var.VariableName, var16, sizeof(var16));
        ev->var.VendorGuid = GMIN_CFG_VAR_EFI_GUID;
+       ev->var.DataSize = *out_len;
 
-       efilen = *out_len;
-       ret = efivar_entry_get(ev, &efiattr_dummy, &efilen, out);
+       ret = efivar_entry_get(ev, &ev->var.Attributes,
+                              &ev->var.DataSize, ev->var.Data);
+       if (ret == 0) {
+               memcpy(out, ev->var.Data, ev->var.DataSize);
+               *out_len = ev->var.DataSize;
+       } else {
+               dev_warn(dev, "Failed to find gmin variable %s\n", var8);
+       }
 
        kfree(ev);
-       *out_len = efilen;
-
-       if (ret)
-               dev_warn(dev, "Failed to find gmin variable %s\n", var8);
 
        return ret;
 }