Received-SPF: pass (google.com: domain of linux-kernel+bounces-90651-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
Precedence: bulk
MIME-Version: 1.0
References: <20240301143731.3494455-1-sumit.garg@linaro.org> <CAFA6WYOdyPG8xNCwchSzGW+KiaXZJ8LTYuKpyEbhV=tdYz=gUg@mail.gmail.com>
In-Reply-To: <CAFA6WYOdyPG8xNCwchSzGW+KiaXZJ8LTYuKpyEbhV=tdYz=gUg@mail.gmail.com>
From: Jens Wiklander <jens.wiklander@linaro.org>
Date: Mon, 4 Mar 2024 14:29:49 +0100
Message-ID: <CAHUa44HWiWNab1TbQxHVBZOpqbp+XhNGSNoL+pXrv7xJkHShxg@mail.gmail.com>
Subject: Re: [PATCH] tee: optee: Fix kernel panic caused by incorrect error handling
To: Sumit Garg <sumit.garg@linaro.org>
Cc: Arnd Bergmann <arnd@arndb.de>, op-tee@lists.trustedfirmware.org, 
	ilias.apalodimas@linaro.org, jerome.forissier@linaro.org, 
	linux-kernel@vger.kernel.org, mikko.rapeli@linaro.org, stable@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

Hi,

On Mon, Mar 4, 2024 at 6:45=E2=80=AFAM Sumit Garg <sumit.garg@linaro.org> w=
rote:
>
> + Arnd
>
> On Fri, 1 Mar 2024 at 20:07, Sumit Garg <sumit.garg@linaro.org> wrote:
> >
> > The error path while failing to register devices on the TEE bus has a
> > bug leading to kernel panic as follows:
> >
> > [   15.398930] Unable to handle kernel paging request at virtual addres=
s ffff07ed00626d7c
> > [   15.406913] Mem abort info:
> > [   15.409722]   ESR =3D 0x0000000096000005
> > [   15.413490]   EC =3D 0x25: DABT (current EL), IL =3D 32 bits
> > [   15.418814]   SET =3D 0, FnV =3D 0
> > [   15.421878]   EA =3D 0, S1PTW =3D 0
> > [   15.425031]   FSC =3D 0x05: level 1 translation fault
> > [   15.429922] Data abort info:
> > [   15.432813]   ISV =3D 0, ISS =3D 0x00000005, ISS2 =3D 0x00000000
> > [   15.438310]   CM =3D 0, WnR =3D 0, TnD =3D 0, TagAccess =3D 0
> > [   15.443372]   GCS =3D 0, Overlay =3D 0, DirtyBit =3D 0, Xs =3D 0
> > [   15.448697] swapper pgtable: 4k pages, 48-bit VAs, pgdp=3D00000000d9=
e3e000
> > [   15.455413] [ffff07ed00626d7c] pgd=3D1800000bffdf9003, p4d=3D1800000=
bffdf9003, pud=3D0000000000000000
> > [   15.464146] Internal error: Oops: 0000000096000005 [#1] PREEMPT SMP
> >
> > Commit 7269cba53d90 ("tee: optee: Fix supplicant based device enumerati=
on")
> > lead to the introduction of this bug. So fix it appropriately.
> >
> > Reported-by: Mikko Rapeli <mikko.rapeli@linaro.org>
> > Closes: https://bugzilla.kernel.org/show_bug.cgi?id=3D218542
> > Fixes: 7269cba53d90 ("tee: optee: Fix supplicant based device enumerati=
on")
> > Cc: stable@vger.kernel.org
> > Signed-off-by: Sumit Garg <sumit.garg@linaro.org>
> > ---
> >  drivers/tee/optee/device.c | 3 ++-
> >  1 file changed, 2 insertions(+), 1 deletion(-)
> >
>
> Jens, Arnd,
>
> Is there any chance for this fix to make it into v6.8 release?

I'm picking up this and have also just sent it in a pull request for
v6.8. If it makes it into v6.8 remains to be seen.

Thanks,
Jens

>
> -Sumit
>
> > diff --git a/drivers/tee/optee/device.c b/drivers/tee/optee/device.c
> > index 9d2afac96acc..d296c70ddfdc 100644
> > --- a/drivers/tee/optee/device.c
> > +++ b/drivers/tee/optee/device.c
> > @@ -90,13 +90,14 @@ static int optee_register_device(const uuid_t *devi=
ce_uuid, u32 func)
> >         if (rc) {
> >                 pr_err("device registration failed, err: %d\n", rc);
> >                 put_device(&optee_device->dev);
> > +               return rc;
> >         }
> >
> >         if (func =3D=3D PTA_CMD_GET_DEVICES_SUPP)
> >                 device_create_file(&optee_device->dev,
> >                                    &dev_attr_need_supplicant);
> >
> > -       return rc;
> > +       return 0;
> >  }
> >
> >  static int __optee_enumerate_devices(u32 func)
> > --
> > 2.34.1
> >