Received: by 2002:a05:6a10:413:0:0:0:0 with SMTP id 19csp892359pxp; Wed, 16 Mar 2022 20:23:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzsWV1eNgUS/MBB+JG/M46JTK+NUrp2ll42cS+GN1Edjus7O8Wjv9wIHzgUKEIuFS1M8UU5 X-Received: by 2002:a17:902:ea0e:b0:152:7cf:1b8a with SMTP id s14-20020a170902ea0e00b0015207cf1b8amr3047647plg.4.1647487434544; Wed, 16 Mar 2022 20:23:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1647487434; cv=none; d=google.com; s=arc-20160816; b=0DnKIIlM9k6yjq1lH46/i6ootCzBc3eWdUQvHhE2+gXP+Ynjh4ADhPjjuyHuvz6Zrv 2/NEjwdOn4CPXDyfhux/Y2Zy9QpV6H+vT8AlB17tuGYlDwtx2ZcjFUi5sbnLyvk9MlHO XX+v05CXjuq51bnc0lcgNW4aQOD6GHn58P93udUuj0mhcLGpGW0LGlx93PAKBd6NtuDw yCIB1WF4LRXfdHTswGzY5u/HE35GXVbtIbmKccV75TbjrEAGQZpkv36JJkyPF/bc7E64 GZOmelRFgJtAe9o2YLTCIkCv1mvVEVkbPGeBhp2aQ1Gfl03g7tTrqDcE+DrDcF5ceWFd nf8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=UAMUEHK41xlDkfw7jMqSFrYVUFGF2QkzhUzIkNH44zM=; b=AGTuO24PUNWR3jeT4QoeYJdDe2HI6QpYza/pTMFYeIaEYyo+ZjyluYRIHqxiDkiZ+2 P5Evwy1bH9qik3Umd4bdwQj1NczXim+D2LBw74UvQMSCbvPy7JDBueY/9BoaNFERzUh9 xlFKD71Y2iD0tYvTX3RMa3w5nRKyI6r6AsOmGLaUi4mlNR8q8OFwb8X33JVjKECMezeL NFtZZd2EQBsspkSrA0h/ZhMrlIiO+L6mNU3yJEPXfTkYYPeJIjHhoyuMlDa0X+9egq0N ScXvMOGABPStbRUFKfw5CUbB5ziPZmIjEOPNmu6Tb6KQMs9dU30MhnmYVM4ifzYIEEMs 70iw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [2620:137:e000::1:18]) by mx.google.com with ESMTPS id ob9-20020a17090b390900b001bd14e03044si1363967pjb.28.2022.03.16.20.23.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Mar 2022 20:23:54 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 507252C66C; Wed, 16 Mar 2022 20:23:23 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345765AbiCPNxS (ORCPT + 99 others); Wed, 16 Mar 2022 09:53:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39728 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233718AbiCPNxQ (ORCPT ); Wed, 16 Mar 2022 09:53:16 -0400 Received: from hust.edu.cn (mail.hust.edu.cn [202.114.0.240]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A7CE460CD1 for ; Wed, 16 Mar 2022 06:52:00 -0700 (PDT) Received: from localhost.localdomain ([172.16.0.254]) (user=dzm91@hust.edu.cn mech=LOGIN bits=0) by mx1.hust.edu.cn with ESMTP id 22GDomGD003471-22GDomGG003471 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NO); Wed, 16 Mar 2022 21:50:52 +0800 From: Dongliang Mu To: Jens Wiklander , Sumit Garg Cc: Dongliang Mu , op-tee@lists.trustedfirmware.org, linux-kernel@vger.kernel.org Subject: [PATCH] tee: optee: add missing mutext_destroy in optee_ffa_probe Date: Wed, 16 Mar 2022 21:50:47 +0800 Message-Id: <20220316135047.188122-1-dzm91@hust.edu.cn> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-FEAS-AUTH-USER: dzm91@hust.edu.cn X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RDNS_NONE, SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Dongliang Mu The error handling code of optee_ffa_probe misses the mutex_destroy of ffa.mutex when mutext_init succeeds. Fix this by adding mutex_destory of ffa.mutex at the error handling part Fixes: aceeafefff73 ("optee: use driver internal tee_context for some rpc") Signed-off-by: Dongliang Mu --- drivers/tee/optee/ffa_abi.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/tee/optee/ffa_abi.c b/drivers/tee/optee/ffa_abi.c index f744ab15bf2c..30a6119a2b16 100644 --- a/drivers/tee/optee/ffa_abi.c +++ b/drivers/tee/optee/ffa_abi.c @@ -894,6 +894,7 @@ static int optee_ffa_probe(struct ffa_device *ffa_dev) 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: -- 2.25.1