Merge tag 'v2023.10-rc4' into next

[J-u-boot.git] / common / avb_verify.c

diff --git a/common/avb_verify.c b/common/avb_verify.c
index 0520a714556448aab966c919316926462cc866bd..48ba8db51e59b1c54dd41fd6dce9bfd7f068da23 100644 (file)
--- a/common/avb_verify.c
+++ b/common/avb_verify.c
@@ -619,10 +619,11 @@ static int get_open_session(struct AvbOpsData *ops_data)
                memset(&arg, 0, sizeof(arg));
                tee_optee_ta_uuid_to_octets(arg.uuid, &uuid);
                rc = tee_open_session(tee, &arg, 0, NULL);
-               if (!rc) {
-                       ops_data->tee = tee;
-                       ops_data->session = arg.session;
-               }
+               if (rc || arg.ret)
+                       continue;
+
+               ops_data->tee = tee;
+               ops_data->session = arg.session;
        }
 
        return 0;