Received: by 2002:a05:622a:251a:b0:39a:b4a2:e86 with SMTP id cm26csp316384qtb; Wed, 19 Oct 2022 02:43:28 -0700 (PDT) X-Google-Smtp-Source: AMsMyM53KFqo3zMaMs+6Vn+JzF/vE+73hJWId9FCYlHSYjSP2veFI9qIAYoVd02PBxrn4sqACN4h X-Received: by 2002:a17:902:ea0c:b0:181:61d1:ac1c with SMTP id s12-20020a170902ea0c00b0018161d1ac1cmr7712350plg.120.1666172608717; Wed, 19 Oct 2022 02:43:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666172608; cv=none; d=google.com; s=arc-20160816; b=VfBueH9bXfB0lMi7os4pcGYzUGxqH6sBXAN3F0kEKJ/VlvfPcPcyRQDcnr1xNRrkCx nuzKI7v2JhZ7BsVV8Z4Ix9cn69B/uFKoKaiJnjvF3OfqKlevGt5WPDfF1vRPwFrxHexc AEdRrCfIxDHKWcIUpW1QRrvUkFE6RQ2SbLgG2eAHCE3xa1JQgvv5t9EY4vcYEF3XIvYf yKogNEuj1qkjb4dQqAD9gZ+F+x1XXeRiElD4Rd2zFYsVeHMhW+CCAvvbHhNYNdKPzIrI w4nKBu/ZI7FwtXD5/iVzSwI8cKUyquPIt+sfKoqeoFtTmSP4KvmyUhwjHz/2i4LFWHXz 2qig== 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=ali2am9izUw7tv2jjZQOU8F3ey0iu1Dm0KbapjOUk0c=; b=LGm8vDly5Rn8IYTFHyf90cVnXoYdIkEygW1yTATZbUV8QRFMCJ3yIJJ5BiGwevJ3Dp lBIkg3Nhhrmhm1b4fyqnvv1EP0rS2r0zpf8HJ9mrpQyL6ef4SD7GnH5G0PRGyEelUGwL 7ffhnPv2hu8H7RWFJf5ZtRimie+pHNIKr+z0Y1l5xNPDtva+a9AaGEFeeGZXGhuxtJx2 aAnjraPxWBdzPPWw49ROJMJYTY8TZojSy4LmR6gfYVs9uG235NC00L1PiyXjjId8n5Jx 47GJeAWOt2XJQDGlbMrr8Ie4Xb+1BD3+sCDVYvhqoCkqwxzcq38vHczzZ70ASdFJnpF7 hF5g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=ULtxpYMU; 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 pw18-20020a17090b279200b002009ed52bf6si16285082pjb.19.2022.10.19.02.43.16; Wed, 19 Oct 2022 02:43: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=ULtxpYMU; 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 S233419AbiJSJ2R (ORCPT + 99 others); Wed, 19 Oct 2022 05:28:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44098 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233399AbiJSJ0v (ORCPT ); Wed, 19 Oct 2022 05:26:51 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5D06BE5EEF; Wed, 19 Oct 2022 02:12:02 -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 dfw.source.kernel.org (Postfix) with ESMTPS id 81F14617DE; Wed, 19 Oct 2022 09:09:45 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 96C7DC433D7; Wed, 19 Oct 2022 09:09:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666170585; bh=+pLaFWlsF+KOAjZAyo/mGe/F2d+gV7atMKM+wOKakCo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ULtxpYMUQqpWgZN1yCm1fmjFImBTTKSairsh4qxnSlEs7p9m/9qhjHvMKDq1axCLf xJ/VntgVV0u+5ce6j3AwCrRv8qmwGHm2CHDQdncfkv8u5TLvewIyuKqMM5NsNqpGHW D844OHitkg7Os3m+6GKgCT+z+eE2JRUX1L2qlaiA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dai Ngo , Chuck Lever , Sasha Levin Subject: [PATCH 6.0 678/862] NFSD: fix use-after-free on source server when doing inter-server copy Date: Wed, 19 Oct 2022 10:32:45 +0200 Message-Id: <20221019083319.933818704@linuxfoundation.org> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221019083249.951566199@linuxfoundation.org> References: <20221019083249.951566199@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.4 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 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: Dai Ngo [ Upstream commit 019805fea91599b22dfa62ffb29c022f35abeb06 ] Use-after-free occurred when the laundromat tried to free expired cpntf_state entry on the s2s_cp_stateids list after inter-server copy completed. The sc_cp_list that the expired copy state was inserted on was already freed. When COPY completes, the Linux client normally sends LOCKU(lock_state x), FREE_STATEID(lock_state x) and CLOSE(open_state y) to the source server. The nfs4_put_stid call from nfsd4_free_stateid cleans up the copy state from the s2s_cp_stateids list before freeing the lock state's stid. However, sometimes the CLOSE was sent before the FREE_STATEID request. When this happens, the nfsd4_close_open_stateid call from nfsd4_close frees all lock states on its st_locks list without cleaning up the copy state on the sc_cp_list list. When the time the FREE_STATEID arrives the server returns BAD_STATEID since the lock state was freed. This causes the use-after-free error to occur when the laundromat tries to free the expired cpntf_state. This patch adds a call to nfs4_free_cpntf_statelist in nfsd4_close_open_stateid to clean up the copy state before calling free_ol_stateid_reaplist to free the lock state's stid on the reaplist. Signed-off-by: Dai Ngo Signed-off-by: Chuck Lever Signed-off-by: Sasha Levin --- fs/nfsd/nfs4state.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index c5d199d7e6b4..0bc36472f8b7 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -1049,6 +1049,7 @@ static struct nfs4_ol_stateid * nfs4_alloc_open_stateid(struct nfs4_client *clp) static void nfs4_free_deleg(struct nfs4_stid *stid) { + WARN_ON(!list_empty(&stid->sc_cp_list)); kmem_cache_free(deleg_slab, stid); atomic_long_dec(&num_delegations); } @@ -1462,6 +1463,7 @@ static void nfs4_free_ol_stateid(struct nfs4_stid *stid) release_all_access(stp); if (stp->st_stateowner) nfs4_put_stateowner(stp->st_stateowner); + WARN_ON(!list_empty(&stid->sc_cp_list)); kmem_cache_free(stateid_slab, stid); } @@ -6684,6 +6686,7 @@ static void nfsd4_close_open_stateid(struct nfs4_ol_stateid *s) struct nfs4_client *clp = s->st_stid.sc_client; bool unhashed; LIST_HEAD(reaplist); + struct nfs4_ol_stateid *stp; spin_lock(&clp->cl_lock); unhashed = unhash_open_stateid(s, &reaplist); @@ -6692,6 +6695,8 @@ static void nfsd4_close_open_stateid(struct nfs4_ol_stateid *s) if (unhashed) put_ol_stateid_locked(s, &reaplist); spin_unlock(&clp->cl_lock); + list_for_each_entry(stp, &reaplist, st_locks) + nfs4_free_cpntf_statelist(clp->net, &stp->st_stid); free_ol_stateid_reaplist(&reaplist); } else { spin_unlock(&clp->cl_lock); -- 2.35.1