Skip to contentSkip to conversation

tee: correct max value for id allocation

PATCH In review Peng Fan 3 participants 3 messages Jan 15, 2018 – Feb 26, 2018 TEE

lore
Share & tools
lore

Peng Fan

author
#0 lore raw

PATCH 1/1 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.

Cc Jens Wiklander <[email protected]>
---
 drivers/tee/tee_core.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)
drivers/tee/tee_core.c +9 -5
index 3d49ac2e3c84..d1f4ecdbc8cc 100644
@@ -701,7 +701,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 ||
@@ -715,16 +715,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;
 	}
Signature · 1 line
2.14.1
#1 lore raw

Hi Jens,

Any comments on this patch?

Thanks,
Peng

Quoted 52 lines · Peng Fan

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.

Cc Jens Wiklander <[email protected]>

---
drivers/tee/tee_core.c | 14 +++++++++-----

1 file changed, 9 insertions(+), 5 deletions(-)
drivers/tee/tee_core.c +9 -5
index 3d49ac2e3c84..d1f4ecdbc8cc 100644
@@ -701,7 +701,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 ||
@@ -715,16 +715,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;
 	}
Signature · 1 line
2.14.1
#2 lore raw
Quoted 6 lines · Peng Fan

Hi Jens,

Any comments on this patch?

Thanks,
Peng

Sorry, forgot about this one. Looks good to me, I'll pick it up.

Thanks,
Jens

Quoted 55 lines · Peng Fan
Quoted 50 lines

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.

Cc Jens Wiklander <[email protected]>

---
drivers/tee/tee_core.c | 14 +++++++++-----

1 file changed, 9 insertions(+), 5 deletions(-)
drivers/tee/tee_core.c +9 -6
index 3d49ac2e3c84..d1f4ecdbc8cc 100644
@@ -701,7 +701,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 ||
@@ -715,16 +715,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;
      }
--
Quoted 2 lines

2.14.1

--