| Message ID | 20230127200214.287138-1-ivan.khoronzhuk@globallogic.com |
|---|---|
| State | Accepted |
| Commit | 3106e475243e1e35df18d5086f7a5df8758bbda1 |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | [v4] common: avb_verify: prevent opening incorrect session | expand |
Any comments to this patch?
On Fri, Jan 27, 2023 at 9:02 PM Ivan Khoronzhuk <ivan.khoronzhuk@gmail.com> wrote: > > The arg->session is not valid if arg->ret != NULL, so can't be > assigned, correct this. > > Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@globallogic.com> > --- > common/avb_verify.c | 9 +++++---- > 1 file changed, 5 insertions(+), 4 deletions(-) Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org> Thanks, Jens > > diff --git a/common/avb_verify.c b/common/avb_verify.c > index 0520a71455..48ba8db51e 100644 > --- 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; > -- > 2.34.1 >
On Fri, Jan 27, 2023 at 10:02:14PM +0200, Ivan Khoronzhuk wrote: > The arg->session is not valid if arg->ret != NULL, so can't be > assigned, correct this. > > Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@globallogic.com> > Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org> Applied to u-boot/master, thanks!
diff --git a/common/avb_verify.c b/common/avb_verify.c index 0520a71455..48ba8db51e 100644 --- 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;
The arg->session is not valid if arg->ret != NULL, so can't be assigned, correct this. Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@globallogic.com> --- common/avb_verify.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)