Received: by 2002:a6b:500f:0:0:0:0:0 with SMTP id e15csp1040991iob; Wed, 4 May 2022 13:19:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx5GVkgxLMLz2TwlmJMBq0+9Sv/EsSu6Aj5EJ97A1jSFSQ185OKEbRto6GnyPuxxX1X8bMz X-Received: by 2002:a17:907:1c25:b0:6f4:2d46:52ce with SMTP id nc37-20020a1709071c2500b006f42d4652cemr18968287ejc.25.1651695568029; Wed, 04 May 2022 13:19:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651695568; cv=none; d=google.com; s=arc-20160816; b=w5miZ+fvRBJgPna67da70pOCAvb7eeqbPnjWa733p9knO8i999IKG/RTEt4KhZFpdB cD2mURoCydzw+FvJ8GlNTMbboR8T3d/ZQacAmOjxqYpALtvgfCm6ZuI7ixYTJ44S/ja8 Q4CfBbP1xAyf6d8eezKt8ZLNHPfJzptwBxT8QrObNDvW/24ru6cq25KGxK8CcZvCC1qM T4bHTsl+2jDLQamYtxYeAsYMy0sueyxSbzLif+XG3p2JvZG0rT9175l/EhgLOLt9gix0 yaNj7zVpnjUXH7x6LiDCSqu2JVPTmTVxFE++TSC5bI9UWBuaXR8mMUsEYTEkcXpg3f8K l2qQ== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Ph/XxScMM9VndTVP6xcxlF16SoD4nMVFiaKGPgzw0b0=; b=CKI6IoV5eRqFveVWKm5hajs0ikVnigiIqGObje96kO/r+tPN413ZOtQTD4n5n8Q66m 9DfGFXl3+dVianrXLZ7f7mWEC2Ssv3+KuVzB2s8JuvwkCSpcZERIP+19Dt3jSuLLgFwz xN2LzrxT0SS0W/fOoz20D0+jQEychxyvB3T3HedLkvSS8o9/ApYAh4bk1QHboIH4pmhO At72G5CnehISSC8x/elnAEUthj+5AJ9s60eoTUvGbnk7j8pQxsLN0zGk5NGPKI2p+qqV ylcbC0Nza9lXOsTer8uSs3fCd2XrIs7uiHsP/qnNPSdpPiFoJJqYB0OOybaewAJZCjPB Psgg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=pscxf8jW; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id a12-20020a50c30c000000b0041d78af2f12si16316940edb.241.2022.05.04.13.19.03; Wed, 04 May 2022 13:19:28 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=pscxf8jW; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1357949AbiEDRhK (ORCPT + 99 others); Wed, 4 May 2022 13:37:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40892 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1356906AbiEDRJs (ORCPT ); Wed, 4 May 2022 13:09:48 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2C75F47066; Wed, 4 May 2022 09:56:22 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 95C6AB827A3; Wed, 4 May 2022 16:56:21 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2FC29C385AA; Wed, 4 May 2022 16:56:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1651683381; bh=3hl5Abyr5dqFZ/zVqmKDc6D8kC4kQ2wP/P9hBWlUJCc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pscxf8jWR3/Ue76JBwcnW3uYbBYOz9YnxBLMkJyrx/xUJnOfCZYPQDODQDsfBT0Dp IdHFMkLIu6bmuDQ36JPItmcuaPysTcO6dyh/2snI5WoKJa7A8/Vr+YbcpmdACIY/L8 DE3Sf7L/nRr53eoCEvX3ZRAoJBlu91fVOCy5qKcM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dongliang Mu , Jens Wiklander , Sasha Levin Subject: [PATCH 5.17 066/225] tee: optee: add missing mutext_destroy in optee_ffa_probe Date: Wed, 4 May 2022 18:45:04 +0200 Message-Id: <20220504153116.059763982@linuxfoundation.org> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220504153110.096069935@linuxfoundation.org> References: <20220504153110.096069935@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham 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 [ Upstream commit b5e22886839ae466fcf03295150094516c0fd8eb ] 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 Signed-off-by: Jens Wiklander Signed-off-by: Sasha Levin --- 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.35.1