Unverified Commit 3f711c24 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'optee-use-kmemdup-for-6.5' of... 

Merge tag 'optee-use-kmemdup-for-6.5' of https://git.linaro.org/people/jens.wiklander/linux-tee into soc/drivers

Use kmemdup() in OP-TEE driver

* tag 'optee-use-kmemdup-for-6.5' of https://git.linaro.org/people/jens.wiklander/linux-tee:
  tee: optee: Use kmemdup() to replace kmalloc + memcpy

Link: https://lore.kernel.org/r/20230615130049.GA979203@rayden


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 57cf6633 6a8b7e80

drivers/tee/optee/smc_abi.c

+1 −2
Original line number Diff line number Diff line
@@ -1539,12 +1539,11 @@ static int optee_load_fw(struct platform_device *pdev, 
	 * This uses the GFP_DMA flag to ensure we are allocated memory in the

	 * 32-bit space since TF-A cannot map memory beyond the 32-bit boundary.

	 */

	data_buf = kmalloc(fw->size, GFP_KERNEL | GFP_DMA);

	data_buf = kmemdup(fw->data, fw->size, GFP_KERNEL | GFP_DMA);

	if (!data_buf) {

		rc = -ENOMEM;

		goto fw_err;

	}

	memcpy(data_buf, fw->data, fw->size);

	data_pa = virt_to_phys(data_buf);

	reg_pair_from_64(&data_pa_high, &data_pa_low, data_pa);

	reg_pair_from_64(&data_size_high, &data_size_low, data_size);