From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id AC5C7CE79CF for ; Wed, 20 Sep 2023 12:18:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235384AbjITMSL (ORCPT ); Wed, 20 Sep 2023 08:18:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49504 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235579AbjITMSI (ORCPT ); Wed, 20 Sep 2023 08:18:08 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 91DB4B4 for ; Wed, 20 Sep 2023 05:18:02 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 144ECC433C8; Wed, 20 Sep 2023 12:18:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1695212282; bh=pzZPDZRza7EXku2giKDQ7CK+OBGTRH4I8E8io1Zihj4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MeWDMjZXmh8zI3S39vq0aVoyrCZQcT6cw7nIoyABwSMUDE/dX1i5iDjG9MyQQnZoc +WkVzZQkbKKL/Z3J9E5W5hYpEEb9gMJD4veezPMW721rcg/8eof+yLW3jEwegDHGDJ 6pSRehT7xxF54zhMbIpd5TyWn2HGZvNzKp3Bj4cQ= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Shigeru Yoshida , Paolo Abeni , Sasha Levin Subject: [PATCH 4.19 219/273] kcm: Destroy mutex in kcm_exit_net() Date: Wed, 20 Sep 2023 13:30:59 +0200 Message-ID: <20230920112853.199608202@linuxfoundation.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20230920112846.440597133@linuxfoundation.org> References: <20230920112846.440597133@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 4.19-stable review patch. If anyone has any objections, please let me know. ------------------ From: Shigeru Yoshida [ Upstream commit 6ad40b36cd3b04209e2d6c89d252c873d8082a59 ] kcm_exit_net() should call mutex_destroy() on knet->mutex. This is especially needed if CONFIG_DEBUG_MUTEXES is enabled. Fixes: ab7ac4eb9832 ("kcm: Kernel Connection Multiplexor module") Signed-off-by: Shigeru Yoshida Link: https://lore.kernel.org/r/20230902170708.1727999-1-syoshida@redhat.com Signed-off-by: Paolo Abeni Signed-off-by: Sasha Levin --- net/kcm/kcmsock.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net/kcm/kcmsock.c b/net/kcm/kcmsock.c index c0034546a9edf..55f1bf7a84490 100644 --- a/net/kcm/kcmsock.c +++ b/net/kcm/kcmsock.c @@ -1983,6 +1983,8 @@ static __net_exit void kcm_exit_net(struct net *net) * that all multiplexors and psocks have been destroyed. */ WARN_ON(!list_empty(&knet->mux_list)); + + mutex_destroy(&knet->mutex); } static struct pernet_operations kcm_net_ops = { -- 2.40.1