commit 47da3f50772943f5b39cad69f82ad04195771691
author Tri Vo <trong@google.com> Tue Jan 19 13:53:04 2021 -0800
committer Tri Vo <trong@google.com> Tue Jan 19 15:15:55 2021 -0800
tree ad5274d5f9749c8f8cfff6d77bd5d8708a8d8d18
parent ec1fa501e3e4351e4f91cdc0778c026742f3e830

secure_fb: Fix error paths

Bug: 177934005
Test: kill securedpud, com.android.trusty.secure_fb.test doesn't hang
Change-Id: I4e3320db3a612c52cb72f6d63142febc9adcbff0

lib/secure_fb/secure_fb.c

diff --git a/lib/secure_fb/secure_fb.c b/lib/secure_fb/secure_fb.c
index 05041a8..b4294ac 100644
--- a/lib/secure_fb/secure_fb.c
+++ b/lib/secure_fb/secure_fb.c
@@ -281,7 +281,7 @@
     }
 
     s = new_connected_session();
-    if (session == NULL) {
+    if (s == NULL) {
         return TTUI_ERROR_MEMORY_ALLOCATION_FAILED;
     }
 

lib/secure_fb/srv/secure_fb_server.c

diff --git a/lib/secure_fb/srv/secure_fb_server.c b/lib/secure_fb/srv/secure_fb_server.c
index 036f527..16933d5 100644
--- a/lib/secure_fb/srv/secure_fb_server.c
+++ b/lib/secure_fb/srv/secure_fb_server.c
@@ -133,8 +133,9 @@
     if (rc != (int)sizeof(hdr)) {
         TLOGE("Failed to send SECURE_FB_CMD_DISPLAY_FB response (%d)\n", rc);
         if (rc >= 0) {
-            return ERR_BAD_LEN;
+            rc = ERR_BAD_LEN;
         }
+        return rc;
     }
 
     return NO_ERROR;