5.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Shao-Fu Chen [ Upstream commit c108feca0a096f8db25d1b69130035025e9e936d ] optee_probe() called tee_device_register() on both the client and the supplicant device before the rest of struct optee had been initialized. tee_device_register() calls cdev_device_add(), which does two things at once: it creates /dev/tee0 and /dev/teepriv0, and it links the device into the tee class so that class_find_device() can find it. From that moment on the device is reachable both from user space via tee_open() and from kernel space via tee_client_open_context(). The only gate in teedev_open() is tee_device_get(), which merely checks that teedev->desc is non-NULL, which was already set by tee_device_alloc(). Therefore, there is effectively no gate at all. A context opened in that window can run against a struct optee where - optee->call_queue.mutex is not initialized by optee_cq_init() - optee->supp mutex and completions is not initialized by optee_supp_init() - optee->rpmb_dev_mutex is not initialized yet, - the message argument cache is not initialized by optee_shm_arg_cache_init() - optee->ctx is still NULL Any open session or invoke during this window takes uninitialized mutexes and dereferences a NULL pointer. Fix it by moving both tee_device_register() calls down to the point where all of struct optee is set up. Fixes: 4fb0a5eb364d ("tee: add OP-TEE driver") Cc: stable@vger.kernel.org Signed-off-by: Shao-Fu Chen [JW: adding fixes and cc] Signed-off-by: Jens Wiklander [ sashal: adapted separate FF-A and SMC probe changes to the unified optee_probe() with optee_remove() cleanup ] Signed-off-by: Sasha Levin --- drivers/tee/optee/core.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/drivers/tee/optee/core.c b/drivers/tee/optee/core.c index 6ea80add7378f..f45883476b122 100644 --- a/drivers/tee/optee/core.c +++ b/drivers/tee/optee/core.c @@ -707,14 +707,6 @@ static int optee_probe(struct platform_device *pdev) } optee->supp_teedev = teedev; - rc = tee_device_register(optee->teedev); - if (rc) - goto err; - - rc = tee_device_register(optee->supp_teedev); - if (rc) - goto err; - mutex_init(&optee->call_queue.mutex); INIT_LIST_HEAD(&optee->call_queue.waiters); optee_wait_queue_init(&optee->wait_queue); @@ -744,14 +736,24 @@ static int optee_probe(struct platform_device *pdev) platform_set_drvdata(pdev, optee); + rc = tee_device_register(optee->teedev); + if (rc) + goto err_remove; + + rc = tee_device_register(optee->supp_teedev); + if (rc) + goto err_remove; + rc = optee_enumerate_devices(PTA_CMD_GET_DEVICES); - if (rc) { - optee_remove(pdev); - return rc; - } + if (rc) + goto err_remove; pr_info("initialized driver\n"); return 0; + +err_remove: + optee_remove(pdev); + return rc; err: if (optee) { /* -- 2.53.0