Unverified Commit 3536ac5d authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'optee-fix2-for-v5.15' of... 

Merge tag 'optee-fix2-for-v5.15' of git://git.linaro.org/people/jens.wiklander/linux-tee into arm/fixes

Fix missing devices unregister during optee_remove

Unregisters OP-TEE client devices (UUIDs of some known Trusted
Applications) from the TEE bus when the OP-TEE driver is unloaded.

* tag 'optee-fix2-for-v5.15' of git://git.linaro.org/people/jens.wiklander/linux-tee:
  tee: optee: Fix missing devices unregister during optee_remove

Link: https://lore.kernel.org/r/20211013122854.GA1542549@jade


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 04705129 7f565d0e

drivers/tee/optee/core.c

+3 −0
Original line number Diff line number Diff line
@@ -585,6 +585,9 @@ static int optee_remove(struct platform_device *pdev) 
{

	struct optee *optee = platform_get_drvdata(pdev);



	/* Unregister OP-TEE specific client devices on TEE bus */

	optee_unregister_devices();



	/*

	 * Ask OP-TEE to free all cached shared memory objects to decrease

	 * reference counters and also avoid wild pointers in secure world

drivers/tee/optee/device.c

+22 −0
Original line number Diff line number Diff line
@@ -53,6 +53,13 @@ static int get_devices(struct tee_context *ctx, u32 session, 
	return 0;

}



static void optee_release_device(struct device *dev)

{

	struct tee_client_device *optee_device = to_tee_client_device(dev);



	kfree(optee_device);

}



static int optee_register_device(const uuid_t *device_uuid)

{

	struct tee_client_device *optee_device = NULL;
@@ -63,6 +70,7 @@ static int optee_register_device(const uuid_t *device_uuid) 
		return -ENOMEM;



	optee_device->dev.bus = &tee_bus_type;

	optee_device->dev.release = optee_release_device;

	if (dev_set_name(&optee_device->dev, "optee-ta-%pUb", device_uuid)) {

		kfree(optee_device);

		return -ENOMEM;
@@ -154,3 +162,17 @@ int optee_enumerate_devices(u32 func) 
{

	return  __optee_enumerate_devices(func);

}



static int __optee_unregister_device(struct device *dev, void *data)

{

	if (!strncmp(dev_name(dev), "optee-ta", strlen("optee-ta")))

		device_unregister(dev);



	return 0;

}



void optee_unregister_devices(void)

{

	bus_for_each_dev(&tee_bus_type, NULL, NULL,

			 __optee_unregister_device);

}

drivers/tee/optee/optee_private.h

+1 −0
Original line number Diff line number Diff line
@@ -184,6 +184,7 @@ void optee_fill_pages_list(u64 *dst, struct page **pages, int num_pages, 
#define PTA_CMD_GET_DEVICES		0x0

#define PTA_CMD_GET_DEVICES_SUPP	0x1

int optee_enumerate_devices(u32 func);

void optee_unregister_devices(void);



/*

 * Small helpers