Commit 98e152c1 authored by Ard Biesheuvel's avatar Ard Biesheuvel
Browse files

brcmfmac: Switch to appropriate helper to load EFI variable contents 



Avoid abusing the efivar layer by invoking it with locally constructed
efivar_entry instances, and instead, just call the EFI routines directly
if available.

Acked-by: default avatarKalle Valo <kvalo@kernel.org>
Signed-off-by: default avatarArd Biesheuvel <ardb@kernel.org>
parent 0c4bad7f

drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c

+8 −17
Original line number Original line Diff line number Diff line
@@ -459,43 +459,34 @@ static void brcmf_fw_fix_efi_nvram_ccode(char *data, unsigned long data_len) 




static u8 *brcmf_fw_nvram_from_efi(size_t *data_len_ret)

static u8 *brcmf_fw_nvram_from_efi(size_t *data_len_ret)

{

{

	const u16 name[] = { 'n', 'v', 'r', 'a', 'm', 0 };

	efi_guid_t guid = EFI_GUID(0x74b00bd9, 0x805a, 0x4d61, 0xb5, 0x1f,

	struct efivar_entry *nvram_efivar;

				   0x43, 0x26, 0x81, 0x23, 0xd1, 0x13);

	unsigned long data_len = 0;

	unsigned long data_len = 0;

	efi_status_t status;

	u8 *data = NULL;

	u8 *data = NULL;

	int err;





	nvram_efivar = kzalloc(sizeof(*nvram_efivar), GFP_KERNEL);

	if (!efi_rt_services_supported(EFI_RT_SUPPORTED_GET_VARIABLE))

	if (!nvram_efivar)

		return NULL;

		return NULL;





	memcpy(&nvram_efivar->var.VariableName, name, sizeof(name));

	status = efi.get_variable(L"nvram", &guid, NULL, &data_len, NULL);

	nvram_efivar->var.VendorGuid = EFI_GUID(0x74b00bd9, 0x805a, 0x4d61,

	if (status != EFI_BUFFER_TOO_SMALL)

						0xb5, 0x1f, 0x43, 0x26,

						0x81, 0x23, 0xd1, 0x13);



	err = efivar_entry_size(nvram_efivar, &data_len);

	if (err)

		goto fail;

		goto fail;





	data = kmalloc(data_len, GFP_KERNEL);

	data = kmalloc(data_len, GFP_KERNEL);

	if (!data)

	if (!data)

		goto fail;

		goto fail;





	err = efivar_entry_get(nvram_efivar, NULL, &data_len, data);

	status = efi.get_variable(L"nvram", &guid, NULL, &data_len, data);

	if (err)

	if (status != EFI_SUCCESS)

		goto fail;

		goto fail;





	brcmf_fw_fix_efi_nvram_ccode(data, data_len);

	brcmf_fw_fix_efi_nvram_ccode(data, data_len);

	brcmf_info("Using nvram EFI variable\n");

	brcmf_info("Using nvram EFI variable\n");





	kfree(nvram_efivar);

	*data_len_ret = data_len;

	*data_len_ret = data_len;

	return data;

	return data;



fail:

fail:

	kfree(data);

	kfree(data);

	kfree(nvram_efivar);

	return NULL;

	return NULL;

}

}

#else

#else