Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1652121

[PATCH v5 1/7] staging: atomisp: Fix calling efivar_entry_get() with unaligned arguments

Show all headers | View raw

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>
---
 .../atomisp/platform/intel-mid/atomisp_gmin_platform.c  | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

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 5b4506a71126..104fea2f8697 100644
--- a/drivers/staging/media/atomisp/platform/intel-mid/atomisp_gmin_platform.c
+++ b/drivers/staging/media/atomisp/platform/intel-mid/atomisp_gmin_platform.c
@@ -623,9 +623,7 @@ int gmin_get_config_var(struct device *dev, const char *var, char *out, size_t *
 	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;
@@ -684,15 +682,18 @@ int gmin_get_config_var(struct device *dev, const char *var, char *out, size_t *
 		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;
 }
-- 
2.13.0

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH v5 1/7] staging: atomisp: Fix calling efivar_entry_get() with unaligned arguments Hans de Goede <hdegoede@redhat.com> - 2017-05-28 14:40 +0200
  [PATCH v5 2/7] staging: atomisp: Do not call dev_warn with a NULL device Hans de Goede <hdegoede@redhat.com> - 2017-05-28 14:40 +0200
    Re: [PATCH v5 2/7] staging: atomisp: Do not call dev_warn with a  NULL device Alan Cox <gnomes@lxorguk.ukuu.org.uk> - 2017-05-28 19:10 +0200
      Re: [PATCH v5 2/7] staging: atomisp: Do not call dev_warn with a NULL  device Hans de Goede <hdegoede@redhat.com> - 2017-05-28 20:30 +0200
        Re: [PATCH v5 2/7] staging: atomisp: Do not call dev_warn with a  NULL device Alan Cox <gnomes@lxorguk.ukuu.org.uk> - 2017-05-28 22:10 +0200
  [PATCH v5 3/7] staging: atomisp: Set step to 0 for mt9m114 menu control Hans de Goede <hdegoede@redhat.com> - 2017-05-28 14:40 +0200

csiph-web