Re: [PATCH] tee: optee: Fix kernel panic caused by incorrect error handling

From: Arnd Bergmann
Date: Mon Mar 04 2024 - 12:05:53 EST


On Mon, Mar 4, 2024, at 06:45, Sumit Garg wrote:
> + Arnd
>
> On Fri, 1 Mar 2024 at 20:07, Sumit Garg <sumit.garg@xxxxxxxxxx> 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 address ffff07ed00626d7c
>> [ 15.406913] Mem abort info:
>> [ 15.409722] ESR = 0x0000000096000005
>> [ 15.413490] EC = 0x25: DABT (current EL), IL = 32 bits
>> [ 15.418814] SET = 0, FnV = 0
>> [ 15.421878] EA = 0, S1PTW = 0
>> [ 15.425031] FSC = 0x05: level 1 translation fault
>> [ 15.429922] Data abort info:
>> [ 15.432813] ISV = 0, ISS = 0x00000005, ISS2 = 0x00000000
>> [ 15.438310] CM = 0, WnR = 0, TnD = 0, TagAccess = 0
>> [ 15.443372] GCS = 0, Overlay = 0, DirtyBit = 0, Xs = 0
>> [ 15.448697] swapper pgtable: 4k pages, 48-bit VAs, pgdp=00000000d9e3e000
>> [ 15.455413] [ffff07ed00626d7c] pgd=1800000bffdf9003, p4d=1800000bffdf9003, pud=0000000000000000
>> [ 15.464146] Internal error: Oops: 0000000096000005 [#1] PREEMPT SMP
>>
>> Commit 7269cba53d90 ("tee: optee: Fix supplicant based device enumeration")
>> lead to the introduction of this bug. So fix it appropriately.
>>
>> Reported-by: Mikko Rapeli <mikko.rapeli@xxxxxxxxxx>
>> Closes: https://bugzilla.kernel.org/show_bug.cgi?id=218542
>> Fixes: 7269cba53d90 ("tee: optee: Fix supplicant based device enumeration")
>> Cc: stable@xxxxxxxxxxxxxxx
>> Signed-off-by: Sumit Garg <sumit.garg@xxxxxxxxxx>
>> ---
>> 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 merged the pull request into my arm/fixes branch now, will
send the branch on once it passes CI.

Arnd