OP-TEE fix missing mutex_destroy in probe error handling path

-----BEGIN PGP SIGNATURE-----
 
 iQJOBAABCgA4FiEEFV+gSSXZJY9ZyuB5LinzTIcAHJcFAmJWW6EaHGplbnMud2lr
 bGFuZGVyQGxpbmFyby5vcmcACgkQLinzTIcAHJd2gQ/+I9pjDAJtl6kXQ6YLgbib
 8hT4vm5zE862l89CwRF7NtvCVKCOce1PH8oYZmSGyEhAdQAbxovG2peFBIpq6SzN
 xUWamw6+tAVmpFe3mlCR1gFq9Z38KVrewd3gCwShosZJEkIY+vo1/WBVEIlFFa8k
 wj6pczBcPf3/e0vpvQe2cxKb+7RRTMjWD/9ozw9SEwfD/TG/WyyIRIsyr/1tdIpn
 lyzHDT18mhL1DRUIqG7oHv0lf6Hjhk1ZGImkTWrW+k/5WKHAVRByTPa4uz+6CNQf
 28HsRNjzRhl29VkI1o/pN+gGtM8+iSVzMhNdJY1tZUM2NQb9Ednp6SZ2HRpoUuH6
 NPgspZu//ey50I94p7aW12wjTXBoRDMc/b0Kd6mcEhI4XrmTLSpZ1TViSPJ7NeDv
 ozmLh0tdQ7+0gizr98V4AkmAWTCK/eE6i5SWDw9VEbQ11SSEQwnf7hMunyOFPvyu
 cxpAs0dIb5Z0vH6EG/HBHN58i3aT3ZFrz91nbwmqBcW5cFdZIwQ6u31Rew8Qfldl
 upZJvYovKkGJC9C3o4l2b6GT23QkYiuMX3BRwJjxRPzu5/oKQtqsdb9IeZHv55wK
 5BDY5pKYfRePF2Y5QCLEXxlb4x/Ijy+mKoBnYz/cgj5Yt5oZC1JZYAHQUoNauxAY
 Ac3PfjOfRaORn/gYVZ/WasE=
 =ij+e
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmJYi+sACgkQmmx57+YA
 GNlwsQ/+JwT7ifx4CIHcrd6Zbsu2c9db8jfO8doLMhR/aCJA09Q2y73LuirkROPK
 9hRgtVGWWDeGcgOIxGegnm6yg6W474lW64h17ucgaHAMrvYwm9O7qyPdl6j6K9LU
 fx4HwtNSM/IA6DhSBMvJ07FKhOhRFeQk2FI+UNvJvGxQpps1Xco674QgK+Av9tJm
 K0qbBWe0hjFbdA7ydYMGEV6jHzRPLeCr5OWsrhdFE06Kk6GmrjCbbXJ6Y++luDJN
 asF3QC8+Ucf22P+zWBxrQNGwXrEU6CyHD1Me8AR36xgbKnfSz0bKl0Ft6sNZA7+I
 //PW59yu0IqTgje4xo9GQX04HzXDBJBjoIWOG2QMR611P/JNWNCK4bbJOE0MBcwD
 sI6CQFnFqCwtQ8rvw8aZc4Kg0D4kQAdGxAjecVm6geiUl0G49gEU7w6ZNy1p0A52
 mBKcG2qKhsT5l5U5tVeoBv0jl+j4Y748AX3GsBC0vGJQBwTGZm/yMngN30LMMTf2
 vhTJxdfDTz0UnlkBxD5L2UCMPWaRjW+QlvJEIkXJAl5OKGbCjXX0Lph7ePwXySM5
 nlcA2sz67UjZFygUl5PC7cNDgZBjFyrEXT3/5HVv4iXh9Blp5Z+mB2AQyN11gwsu
 drhAE1xX/JOEzk2HDk8iGK2Sv2gEAWKU/jQYvEgc/7u1MVdNNHQ=
 =D1gC
 -----END PGP SIGNATURE-----

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

OP-TEE fix missing mutex_destroy in probe error handling path

* tag 'optee-fix-for-v5.18' of git://git.linaro.org/people/jens.wiklander/linux-tee:
  tee: optee: add missing mutext_destroy in optee_ffa_probe

Link: https://lore.kernel.org/r/20220413052001.GA49798@jade
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2022-04-14 23:02:34 +02:00
commit c834eff53c

View File

@ -865,6 +865,7 @@ err_rhashtable_free:
rhashtable_free_and_destroy(&optee->ffa.global_ids, rh_free_fn, NULL);
optee_supp_uninit(&optee->supp);
mutex_destroy(&optee->call_queue.mutex);
mutex_destroy(&optee->ffa.mutex);
err_unreg_supp_teedev:
tee_device_unregister(optee->supp_teedev);
err_unreg_teedev: