Skip to contentSkip to conversation

tee/tee_shm.c: Fix error handling path

PATCH In review Souptick Joarder 2 participants 3 messages Sep 13, 2020 – Sep 14, 2020 TEE

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 tee/tee_shm.c: Fix error handling path

When shm->num_pages <= 0, we should avoid calling release_registered_pages() in error handling path.

---
 drivers/tee/tee_shm.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/tee/tee_shm.c +4 -3
index 00472f5..e517d9f 100644
@@ -260,8 +260,7 @@ struct tee_shm *tee_shm_register(struct tee_context *ctx, unsigned long addr,
 		rc = get_kernel_pages(kiov, num_pages, 0, shm->pages);
 		kfree(kiov);
 	}
-	if (rc > 0)
-		shm->num_pages = rc;
+	shm->num_pages = rc;
 	if (rc != num_pages) {
 		if (rc >= 0)
 			rc = -ENOMEM;
@@ -309,7 +308,9 @@ struct tee_shm *tee_shm_register(struct tee_context *ctx, unsigned long addr,
 			idr_remove(&teedev->idr, shm->id);
 			mutex_unlock(&teedev->mutex);
 		}
-		release_registered_pages(shm);
+		if (shm->pages && (shm->num_pages > 0))
+			release_registered_pages(shm);
+
 	}
 	kfree(shm);
 	teedev_ctx_put(ctx);
Signature · 1 line
1.9.1
#1 lore raw
Quoted 2 lines · Souptick Joarder

When shm->num_pages <= 0, we should avoid calling release_registered_pages() in error handling path.

What are we fixing?

Quoted 12 lines
---
 drivers/tee/tee_shm.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/tee/tee_shm.c +0 -0
index 00472f5..e517d9f 100644

drivers/tee/tee_shm.c struct tee_shm *tee_shm_register(struct tee_context *ctx, unsigned long addr, · line 263

Quoted 6 lines
drivers/tee/tee_shm.c +1 -2
@@ -260,8 +260,7 @@ struct tee_shm *tee_shm_register(struct tee_context *ctx, unsigned long addr,
 		rc = get_kernel_pages(kiov, num_pages, 0, shm->pages);
 		kfree(kiov);
 	}
-	if (rc > 0)
-		shm->num_pages = rc;
+	shm->num_pages = rc;

Why not avoiding assigning invalid values to shm->num_pages? By the way, shm->num_pages is a size_t.

drivers/tee/tee_shm.c struct tee_shm *tee_shm_register(struct tee_context *ctx, unsigned long addr, · line 313

Quoted 11 lines
drivers/tee/tee_shm.c +3 -1
 	if (rc != num_pages) {
 		if (rc >= 0)
 			rc = -ENOMEM;
@@ -309,7 +308,9 @@ struct tee_shm *tee_shm_register(struct tee_context *ctx, unsigned long addr,
 			idr_remove(&teedev->idr, shm->id);
 			mutex_unlock(&teedev->mutex);
 		}
-		release_registered_pages(shm);
+		if (shm->pages && (shm->num_pages > 0))
+			release_registered_pages(shm);
+

With this we'll leak if shm->pages has been assigned something.

Quoted 6 lines
drivers/tee/tee_shm.c +0 -0
 	}
 	kfree(shm);
 	teedev_ctx_put(ctx);
Signature · 1 line
1.9.1

Thanks,
Jens

#2 lore raw
Quoted 5 lines · Jens Wiklander
Quoted 2 lines · Souptick Joarder

When shm->num_pages <= 0, we should avoid calling release_registered_pages() in error handling path.

What are we fixing?

Current code is working fine and this patch is not needed. Sorry for the noise.

Quoted 39 lines
Quoted 13 lines
---
 drivers/tee/tee_shm.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/tee/tee_shm.c +0 -0
index 00472f5..e517d9f 100644

drivers/tee/tee_shm.c struct tee_shm *tee_shm_register(struct tee_context *ctx, unsigned long addr, · line 263

Quoted 6 lines
drivers/tee/tee_shm.c +1 -2
@@ -260,8 +260,7 @@ struct tee_shm *tee_shm_register(struct tee_context *ctx, unsigned long addr,
              rc = get_kernel_pages(kiov, num_pages, 0, shm->pages);
              kfree(kiov);
      }
-     if (rc > 0)
-             shm->num_pages = rc;
+     shm->num_pages = rc;

Why not avoiding assigning invalid values to shm->num_pages? By the way, shm->num_pages is a size_t.

drivers/tee/tee_shm.c struct tee_shm *tee_shm_register(struct tee_context *ctx, unsigned long addr, · line 313

Quoted 11 lines
drivers/tee/tee_shm.c +3 -1
      if (rc != num_pages) {
              if (rc >= 0)
                      rc = -ENOMEM;
@@ -309,7 +308,9 @@ struct tee_shm *tee_shm_register(struct tee_context *ctx, unsigned long addr,
                      idr_remove(&teedev->idr, shm->id);
                      mutex_unlock(&teedev->mutex);
              }
-             release_registered_pages(shm);
+             if (shm->pages && (shm->num_pages > 0))
+                     release_registered_pages(shm);
+

With this we'll leak if shm->pages has been assigned something.

Quoted 4 lines
drivers/tee/tee_shm.c +0 -1
      }
      kfree(shm);
      teedev_ctx_put(ctx);
-