iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix kernel panic in OP-TEE driver

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iQJOBAABCgA4FiEEFV+gSSXZJY9ZyuB5LinzTIcAHJcFAmXlysIaHGplbnMud2lr
 bGFuZGVyQGxpbmFyby5vcmcACgkQLinzTIcAHJft6w/9HMjBHxEFTQaBgx58eGj7
 NLlmf2uYeYKrVCP61xW2GNu5QqRG5lszx7npQimca9eL1N4oAWC+I/l/FZb0RGZJ
 ZzP+pU46gT+7g9NgfF4whhk4w2GTJEZXj0SP8qQ2480M6SY3LIpNytrPcwomAJJ8
 S1ve8Mgv+cypdKu+OxLTfWXXRHTtG5gVkmU3aCkvlN5yuH9037S2W8WSul9IH3D2
 jWLKu3XHdAoDM69J3JWnnP0Pm1sU8Iaar7me0qHwTuZ6Ch0NtDybDR9Pr/cIJTvx
 UXmwRAY5GYx7GbfR3cxvro1yWvQ2dr06+8HojTUKdsfiVT8VJY3n5TqvUAVa9YTZ
 pmrUlvof6c/6GWUGL9rj7pCxqTruMUpFlNRJdaW1h/Z3m3+uCNXA8BsglpBWOyAw
 3oSx+lfalEGWI6G4gj5X3KPTcIjyzG1h7bUt3XFx3YhGY4EBt7QZYJeaF2u+TYQr
 2gzJvAKj6RgZLGm2NAmAfeI3L/65qGFevM8AZ7xmzdn5qmdiEL5EmgxxO+zDHBL9
 BV1GLEk9Tf2nq3/VnD7CgHLadk8gaHsukRsih6CVQqPxPpVh8Rdx+9/SGAXxjnFN
 S9y553WZA+DaVfz2hVgC0NkEYGMCP83Ui+WYwYXSpXjIqIR1jzRdj6hyRuJFmmML
 KclNYBLZbButSQkMI7uZCOo=
 =mE9g
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEiK/NIGsWEZVxh/FrYKtH/8kJUicFAmXl2gkACgkQYKtH/8kJ
 Uidsvg//bMwBTtq3pU++7fbJ3DftoqdeAV7/ancXsdtlMS6UlaD9l8xvLLHBxYeM
 V6zIKQGdSXW2QioBteY77HnnXx5HGYqGaHPGWwnSGOH8moKkP3gASpqY3bm5G/C9
 ow2kQl7zhRkqmgZpzbH6MRi/blg5wH0EpDEtqI4O8EgfHHIwUnQjNjsITZCMR6cd
 LqDP31SNe8NCbQdApU0LoGj2gHqgf2uCp59wbVtTmrNbP/ihmBffR/3/JuB4/s2r
 B8ODg57uvZr5xpRy36saeUypUnmB9I/Hxn2+Awb6tT/bvQRJgj2zVL9zFvUdl57E
 nCB9/+7ajbfgmqjQpMfyzVs5yTjtcphbZliTNbQ700JM7zZt5TxwoCdZttXXmDEf
 qf3ySoc8V2ch4goJa3BhDspz4pFF1X4pU6SUoNXmttFkg/sGrH+P6hX9zRe2ceEG
 MXuJBUh2CFItvoBGLxGGD6q9C1UVrv0qlKGLoZWpv/MykIBuyIUb1eU0NP5wK85z
 Lrhl+oyvlVpYnqK2H9U0HivUGzbLovuRrXHoLCxcrqs+QKMOq6mwkgSkKKqCRW9e
 VOAJhqXVl0VffDXda5Tg6i7dTwhxW2ZgzI1puVBlnThHd6eFsGZN0rWj6xXHNTjD
 MRxB22QdEsdiUgP2d+QGFsc5uIHwJYixIGSyFxoa4zp64SgaiGE=
 =HY33
 -----END PGP SIGNATURE-----

Merge tag 'optee-fix-for-v6.8' of https://git.linaro.org/people/jens.wiklander/linux-tee into arm/fixes

Fix kernel panic in OP-TEE driver

* tag 'optee-fix-for-v6.8' of https://git.linaro.org/people/jens.wiklander/linux-tee:
  tee: optee: Fix kernel panic caused by incorrect error handling

Link: https://lore.kernel.org/r/20240304132727.GA3501807@rayden
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2024-03-04 15:26:16 +01:00
commit 64b9175055
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/tee/optee/device.c
View File

@ -90,13 +90,14 @@ static int optee_register_device(const uuid_t *device_uuid, u32 func)
if (rc) {
pr_err("device registration failed, err: %d\n", rc);
put_device(&optee_device->dev);
return rc;
}
if (func == 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)