diff options
| author | Peng Fan <peng.fan@nxp.com> | 2018-01-15 17:27:35 +0800 |
|---|---|---|
| committer | Jens Wiklander <jens.wiklander@linaro.org> | 2018-03-06 11:03:55 +0100 |
| commit | 7dd003aec2016e90d33f25f90ad4cebb12224a8a (patch) | |
| tree | 7792a4ca10be36ad1b288d4568e4e7ec9063b855 /drivers/tee | |
| parent | 661e50bc853209e41a5c14a290ca4decc43cbfd1 (diff) | |
| download | linux-stable-7dd003aec2016e90d33f25f90ad4cebb12224a8a.tar.gz linux-stable-7dd003aec2016e90d33f25f90ad4cebb12224a8a.tar.bz2 linux-stable-7dd003aec2016e90d33f25f90ad4cebb12224a8a.zip | |
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: Peng Fan <peng.fan@nxp.com>
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
Diffstat (limited to 'drivers/tee')
| -rw-r--r-- | drivers/tee/tee_core.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/drivers/tee/tee_core.c b/drivers/tee/tee_core.c index 6c4b200a4560..0124a91c8d71 100644 --- a/drivers/tee/tee_core.c +++ b/drivers/tee/tee_core.c @@ -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; } |