Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7dd003ae authored by Peng Fan's avatar Peng Fan Committed by Jens Wiklander
Browse files

tee: correct max value for id allocation 



The privileged dev id range is [TEE_NUM_DEVICES / 2, TEE_NUM_DEVICES).
The non-privileged dev id range is [0, TEE_NUM_DEVICES / 2).

So when finding a slot for them, need to use different max value.

Signed-off-by: default avatarPeng Fan <peng.fan@nxp.com>
Signed-off-by: default avatarJens Wiklander <jens.wiklander@linaro.org>
parent 661e50bc

drivers/tee/tee_core.c

+9 −5
Original line number Diff line number Diff line
@@ -693,7 +693,7 @@ struct tee_device *tee_device_alloc(const struct tee_desc *teedesc, 
{

	struct tee_device *teedev;

	void *ret;

	int rc;

	int rc, max_id;

	int offs = 0;



	if (!teedesc || !teedesc->name || !teedesc->ops ||
@@ -707,16 +707,20 @@ struct tee_device *tee_device_alloc(const struct tee_desc *teedesc, 
		goto err;

	}



	if (teedesc->flags & TEE_DESC_PRIVILEGED)

	max_id = TEE_NUM_DEVICES / 2;



	if (teedesc->flags & TEE_DESC_PRIVILEGED) {

		offs = TEE_NUM_DEVICES / 2;

		max_id = TEE_NUM_DEVICES;

	}



	spin_lock(&driver_lock);

	teedev->id = find_next_zero_bit(dev_mask, TEE_NUM_DEVICES, offs);

	if (teedev->id < TEE_NUM_DEVICES)

	teedev->id = find_next_zero_bit(dev_mask, max_id, offs);

	if (teedev->id < max_id)

		set_bit(teedev->id, dev_mask);

	spin_unlock(&driver_lock);



	if (teedev->id >= TEE_NUM_DEVICES) {

	if (teedev->id >= max_id) {

		ret = ERR_PTR(-ENOMEM);

		goto err;

	}