[PATCH v2] common: avb_verify: prevent opening incorrect session

Ivan Khoronzhuk
2023-01-23T15:42:32Z

The arg->session is not valid if arg->ret != NULL, so can't be
assigned. Leave retry for just "ret" error to save same behaviour.

Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@gmail.com>
---
common/avb_verify.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/common/avb_verify.c b/common/avb_verify.c
index 0520a71455..97451592f5 100644
--- a/common/avb_verify.c
+++ b/common/avb_verify.c
@@ -619,10 +619,14 @@ 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)
+ continue;
+
+ if (arg.ret)
+ return -EIO;
+
+ ops_data->tee = tee;
+ ops_data->session = arg.session;
}

return 0;
--
2.34.1