From nobody Wed May 1 01:06:13 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VTf5d5ZPQz5HmhC; Wed, 1 May 2024 01:06:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VTf5d53G3z4rTC; Wed, 1 May 2024 01:06:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714525573; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nEH/B7qpJCt6NLtheh6AJGMcAaQB5y197Ze7SXFih5c=; b=Db93IIHxT3NG/GRujdrOUEVVobpDL0st0GFEWTEef9iW1SswGIVP3yWtluloFNZ4C11xNk zSb96ZeJn9FXDhOKq3OWxjPKg+s5C/Z5fJEeBndYYcFpnX9Qyu8fuoEaZVcFOtQlrwPcSk DQr9GnMjMdDZAIlfMpXzeKeg/+eT4jgBR5gjFZ4DJTs+ZSlYwBD7N4FiWU17ebXix8Nj+Y +f75Y1nz1BjII+yJtamcXD6Wd/HOsrHquDH4tzkXEu6eePaBkmM7pR+H8on4WBPJyTnoHd tmxj1whdLTOIoVN5jqqyBT2f2uzHUx9Sr4cvSvsV75g1xlVhn+awOXdNTCQVDQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714525573; a=rsa-sha256; cv=none; b=Li3ckkg06bxM1qWQhOfP/ZskgTxACSPEWxmnr2ZG51psYpzhMj7vnp5b2YY2eLjki2+djv 7RSBPk7E4sP4fLk2XMtU4jIu2ehkCWhaDUQkwICw4tEKL2H6gP00IOBNza0mobu2gvDTZC 9Dnih9iINhbWU9n/zzn9yW3zSPPTvsXdBv7L3tqvqXjLFSU1XzcmFTNXLumy5K9J+mjXzt Bbc39qg9Fm7i0zL6ViEHg+aLdAE5ZVwllvmuGsTEQgkq7KzbigGZdpdG11f64eN6EhoQQx yxDjnCgb4Qc1oJHcjkaCMQBu6riGEBc0oiYbWttuuNCQpU2J/Nx7ABSqBO8t9A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714525573; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nEH/B7qpJCt6NLtheh6AJGMcAaQB5y197Ze7SXFih5c=; b=ets8E0xRSiha5WxZCBvXt3VdOIer4k7mkRs6vKtTgK0z/5pGv0sHYuATtjHdgknjX+lFdD TICwE6yMQ2IFBU3RAwc2qdAxSGSnVDYUVwhndZ0qIEsTLJtYgmMYmMzbcyRqGkgtwcn7eJ wJLpop5NCsdpPTuJ2SqW0xAZ+rKUsoHXAF2MxNDmxGrIZCocAOPGzlJk9BGTy5twnRmVgp SVe+l0wFzxAj0+gnKspmatVyxTLXakBS3xx1RAt2/u+ER8cMdpX7OJ0pPtHkN/d7Bew1UD Acv9LWeNiyRJKQ2LTI8UWufqS5rAQsnKN6GMvarxtkQwJoRwoT876I/yaZ5pUQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VTf5d4fcLzyLf; Wed, 1 May 2024 01:06:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44116Dra086636; Wed, 1 May 2024 01:06:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44116Ddf086633; Wed, 1 May 2024 01:06:13 GMT (envelope-from git) Date: Wed, 1 May 2024 01:06:13 GMT Message-Id: <202405010106.44116Ddf086633@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: c91861cc216d - stable/14 - nfscl: Do not use nfso_own for delayed nfsrpc_doclose() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c91861cc216d5fdd4824eaace53d08c372f6cf73 Auto-Submitted: auto-generated The branch stable/14 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=c91861cc216d5fdd4824eaace53d08c372f6cf73 commit c91861cc216d5fdd4824eaace53d08c372f6cf73 Author: Rick Macklem AuthorDate: 2024-04-26 03:58:21 +0000 Commit: Rick Macklem CommitDate: 2024-05-01 01:04:52 +0000 nfscl: Do not use nfso_own for delayed nfsrpc_doclose() When an initial attempt to close an NFSv4 lock returns NFSERR_DELAY, the open structure is put on a list for delayed closing. When this is done, the nfso_own field is set to NULL, so it cannot be used by nfsrpc_doclose(). Without this patch, the NFSv4 client can crash when a NFSv4 server replies NFSERR_DELAY to a Close operation. Fortunately, most extant NFSv4 servers do not do this. This patch avoids the crash for any that do return NFSERR_DELAY for Close. Found during a IETF bakeathon testing event this week. (cherry picked from commit 6251027c4252edb3b8f8fc359a40e610349e9af3) --- sys/fs/nfsclient/nfs_clrpcops.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/sys/fs/nfsclient/nfs_clrpcops.c b/sys/fs/nfsclient/nfs_clrpcops.c index 75bb5236cb65..8c5532268287 100644 --- a/sys/fs/nfsclient/nfs_clrpcops.c +++ b/sys/fs/nfsclient/nfs_clrpcops.c @@ -826,6 +826,7 @@ nfsrpc_doclose(struct nfsmount *nmp, struct nfsclopen *op, NFSPROC_T *p, u_int64_t off = 0, len = 0; u_int32_t type = NFSV4LOCKT_READ; int error, do_unlock, trycnt; + bool own_not_null; tcred = newnfs_getcred(); newnfs_copycred(&op->nfso_cred, tcred); @@ -892,22 +893,29 @@ nfsrpc_doclose(struct nfsmount *nmp, struct nfsclopen *op, NFSPROC_T *p, * There could be other Opens for different files on the same * OpenOwner, so locking is required. */ - NFSLOCKCLSTATE(); - nfscl_lockexcl(&op->nfso_own->nfsow_rwlock, NFSCLSTATEMUTEXPTR); - NFSUNLOCKCLSTATE(); + own_not_null = false; + if (op->nfso_own != NULL) { + own_not_null = true; + NFSLOCKCLSTATE(); + nfscl_lockexcl(&op->nfso_own->nfsow_rwlock, NFSCLSTATEMUTEXPTR); + NFSUNLOCKCLSTATE(); + } do { error = nfscl_tryclose(op, tcred, nmp, p, loop_on_delayed); if (error == NFSERR_GRACE) (void) nfs_catnap(PZERO, error, "nfs_close"); } while (error == NFSERR_GRACE); - NFSLOCKCLSTATE(); - nfscl_lockunlock(&op->nfso_own->nfsow_rwlock); + if (own_not_null) { + NFSLOCKCLSTATE(); + nfscl_lockunlock(&op->nfso_own->nfsow_rwlock); + } LIST_FOREACH_SAFE(lp, &op->nfso_lock, nfsl_list, nlp) nfscl_freelockowner(lp, 0); if (freeop && error != NFSERR_DELAY) nfscl_freeopen(op, 0, true); - NFSUNLOCKCLSTATE(); + if (own_not_null) + NFSUNLOCKCLSTATE(); NFSFREECRED(tcred); return (error); }